<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 58c2c0f1 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1622d61 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9afd7e66 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) Code coverage for Bookstore
loading
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
Generated 2022-09-06T10:36:10+03:00
======= <<<<<<< HEAD
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
Generated 2022-10-06T17:07:21+03:00
======= ======= >>>>>>> 96aecde (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> 23c4703e (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

All Files ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 90.68% ======= <<<<<<< HEAD 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= 95.71% >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 95.71% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) 95.79% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> 23c4703e (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) covered at <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 3.03 >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 1.04 ======= <<<<<<< HEAD 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) 3.92 >>>>>>> 752f0c0 (Featire specs) ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) ======= 3.9 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 2.92 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= 2.92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 2.92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 2.92 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 2.92 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 3.03 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) 3.03 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= ======= 3.34 >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> 23c4703e (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 3.03 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) hits/line )

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 34 files in total. ======= <<<<<<< HEAD 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 84809242 (Featire specs) 92 files in total. >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 98beee2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
1118 relevant lines, 1070 lines covered and 48 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 90.68% ======= 99.2% ======= 34 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 377 relevant lines, 374 lines covered and <<<<<<< HEAD 3 lines missed. ( <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 400 relevant lines, 397 lines covered and >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD <<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 400 relevant lines, 397 lines covered and <<<<<<< HEAD >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= 400 relevant lines, 397 lines covered and >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3c (Add login registration pages) 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
377 relevant lines, 374 lines covered and >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= ======= ======= <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) 90.68% <<<<<<< HEAD ======= ======= 90.68% >>>>>>> 824bb2b (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
377 relevant lines, 374 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 90.68% >>>>>>> 824bb2b (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= 41 files in total. <<<<<<< HEAD ======= ======= 41 files in total. >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= 41 files in total. >>>>>>> e3e66f3 (Featire specs) ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) =======
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= 92 files in total. >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased)
1118 relevant lines, 1070 lines covered and 48 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 90.68% ======= 99.2% ======= 34 files in total. ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
377 relevant lines, 374 lines covered and 3 lines missed. ( >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 92 files in total.
1141 relevant lines, 1093 lines covered and 48 lines missed. ( 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> 9bfbd88 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 41 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) ======= 41 files in total. <<<<<<< HEAD ======= 34 files in total. <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= ======= 41 files in total. <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= 99.2% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 112 files in total.
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> 23c4703e (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 92 files in total.
1141 relevant lines, 1093 lines covered and 48 lines missed. ( 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) )
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 11792758 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> e59c273d (Manifest_cache true) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 490b01d6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84809242 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 11792758 (Rebased) >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 96aecde (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 5a2009f1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> c033601 (Rebased) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 11792758 (Rebased) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> f6e20266 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD ======= ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) >>>>>>> c033601 (Rebased) >>>>>>> 8249ff3c (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> 393eff3b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
File % covered Lines Relevant Lines Lines covered Lines missed Avg. Hits / Line
app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rb 100.00 % 36 22 22 0 1.95
app/admin/books.rb 100.00 % 57 41 41 0 2.49
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 4 4.71
app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.401app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/admin/authors.rbapp/controllers/application_controller.rb100.00 % 36 22 22 0 1.95app/controllers/application_controller.rb100.00 % 2 1 1app/controllers/books_controller.rb 93.33 % 30 15 1414 013.8640.91 % 36 22 9 13 0.41100.00 % 36 22 22 0 1.9513.361 14.13
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/reviews_controller.rb 100.00 % 17 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 12 12 012.9012.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.0024.50
app/decorators/paginating_decorator.rb 100.00 % 3 2 20 1.00
app/admin/books.rb 100.00 %57 41 41 0 2.4977 51 51 0 4.20app/admin/books.rb 100.00 % 77 5111 40 0.2251 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 44.715.86
app/controllers/application_controller.rb 100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rbapp/controllers/application_controller.rbapp/controllers/application_controller.rb100.00 % 36 2222 0 1.95app/controllers/application_controller.rbapp/controllers/application_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb 100.00 % 28 14 14 0 13.8640.91 % 36 22 9 13 0.41100.00 % 36 22 22 0 1.95
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 28 14 14 013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.50app/controllers/application_controller.rb 100.00 %1.50
app/decorators/book_decorator.rb 100.00 % 18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 22 1 1 0 1.00
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 44.71app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rbapp/controllers/application_controller.rb100.00 % 2 1 10.90
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/controllers/books_controller.rb93.75 % 31 16 15 1 13.9493.33 % 30 15 14 1 14.13app/controllers/books_controller.rb100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 %19 10 10 0 1.3017 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb 100.00 % 7 432 21 1app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.869 13 0.4122 0 1.950 1.00
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 7 44 0 1.50
app/decorators/book_decorator.rb 100.00 %18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 20 1.00
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rb 100.00 % 3 2 2 0 1.00
app/admin/dashboard.rb42.86 % 14 7 3 44.71app/controllers/books_controller.rb 100.00 % 28 14 14 013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86app/controllers/books_controller.rb 100.00 % 28 14 14 013.3613.8613.36
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 18 109 1 0.9010 0 12.90100.00 % 2 1 1app/controllers/application_controller.rb 100.00 % 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 01.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.9010 0 12.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 21 11 10 1.0013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86
app/controllers/books_controller.rb93.75 % 31 1693.33 % 3015 113.9414.13app/controllers/books_controller.rb100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.931.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 1212 024.500.90
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rb 100.00 % 2 1 10 1.001.86
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25app/controllers/books_controller.rb93.75 % 31 16 15 1 13.9493.33 % 30 15 14 1 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.8613.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 %19 10 10 0 1.3017 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.501 0.75
app/decorators/book_decorator.rb100.00 %44.44 %18 9 4 5 4.67
app/admin/orders.rb 100.00 % 3 2 2 0 1.00
app/controllers/application_controller.rb 100.00 % 15 10 109 1 0.900 47.20
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.250 47.60
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00
app/decorators/author_decorator.rb 100.00 % 7 43 1 0.754 0 1.50
app/decorators/book_decorator.rb90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1app/controllers/application_controller.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1100.00 % 2 1 10 1.00
app/controllers/books_controller.rb93.33 % 30 15 14 1 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.8613.50app/controllers/books_controller.rb 93.75 % 31 16 15 113.94app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb14.94
app/controllers/coupons_controller.rb100.00 % 14 8 8 013.5013.8613.502.8813.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/order_books_controller.rb 80.65 % 54 31 25 6 1.81
app/controllers/orders_controller.rb 100.00 % 7 4 4 0 2.50
app/controllers/reviews_controller.rb 100.00 %17 9 9 0 1.3319 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.501.2575.00 % 7 4 3 1 0.75100.00 % 7 4 4 0 1.501.251.251.25
app/decorators/book_decorator.rb100.00 %66.67 %100.00 %100.00 %100.00 %100.00 %23 1266.67 % 23 1223 1212 024.5012.7090.00 % 18 109 1 0.9010 0 12.9027.5827.50
app/decorators/order_book_decorator.rb 100.00 % 9 5 5 01.0012 025.6712 0 24.5012 025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.40
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb 100.00 % 13 8 8 014.7513.7512 0 25.6712 0 24.50
app/decorators/paginating_decorator.rb 100.00 % 35552 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 91app/controllers/application_controller.rb 100.00 % 2 1 12 20 1.00
app/controllers/books_controller.rb93.33 % 30 15 14100.00 % 28 14100.00 % 28 14100.00 % 28 1414 0 13.361 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/decorators/review_decorator.rb100.00 %7 4 4 0 1.00
app/decorators/user_decorator.rb100.00 % 9 5 5 0 1.401.861.861.861.861.86app/controllers/books_controller.rb1.868 4 0.67app/decorators/review_decorator.rb 100.00 % 7 4 4 0app/decorators/review_decorator.rb 100.00 % 7 4 4 01.00
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.401.861.861.861.861.861.861.86
app/helpers/application_helper.rb100.00 %7 4 4 0 5.00100.00 %5 3 3 0 4.6775.00 % 7 4 3 1 0.75100.00 %7 4 4 0 4.00
app/helpers/constants.rb 100.00 % 27 21 21 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/jobs/application_job.rb 100.00 % 7 1 1 0 1.00
app/jobs/cart_cleaner.rb 60.00 % 8 5 3 2 0.60
app/models/address.rbapp/models/address.rb100.00 % 2412 12 0 13.5013.86app/controllers/books_controller.rb 100.00 %app/controllers/books_controller.rb 100.00 %24 12 12 0 13.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/reviews_controller.rb 100.00 % 17 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 12 12 012.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.0024.50
app/decorators/paginating_decorator.rb 100.00 % 3 2 2 07 7 01.00
app/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.40
app/helpers/application_helper.rb 100.00 %5 3 3 0 4.677 4 4 0 4.0075.00 % 7 4 3 1 0.75100.00 %7 4 4 0 4.00
app/helpers/constants.rb 100.00 % 27 21 21 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/models/address.rb 100.00 % 247 7 0100.00 %app/controllers/books_controller.rb 100.00 %2412 12 0 13.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 01.251.501.25
app/decorators/book_decorator.rb90.00 % 18 10 9 1 0.90100.00 % 18 10 10 0 12.7090.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 %53 2 2 07 7 07 7 01.00
app/decorators/paginating_decorator.rb 100.00 % 352 2 07 7 01.00
app/models/admin_user.rb 100.00 % 6app/helpers/application_helper.rb 100.00 % 3app/helpers/application_helper.rb 100.00 % 3app/helpers/application_helper.rb 100.00 % 32 2app/helpers/application_helper.rbapp/models/admin_user.rb100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/models/admin_user.rb100.00 % 6 2 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 20 1.00
app/models/application_record.rb 100.00 % 3 2 2 0 1.00
app/models/author.rb 100.00 %6 4 46 4 47 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 56 4 46 4 40 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/billing.rb 100.00 % 2 1 16 4 4app/models/authors_book.rb 100.00 % 6 4 40 1.00
app/models/billing.rb 100.00 % 2 1 16 4 40 1.00
app/models/book.rb 100.00 %15 8 8app/models/book.rb 100.00 % 13 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 417 9 917 9 917 9 915 8 8app/models/book.rb 100.00 % 13 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 40 1.00
app/models/books_category.rb 100.00 % 6 4 417app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 9app/models/book.rb 100.00 % 139 9app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 919 10 10app/models/book.rb 100.00 % 15 8 80 1.00
app/models/books_category.rb 100.00 % 6 4 417 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 4 0 1.00
app/models/category.rb 100.00 % 6 4 4 0 1.00
app/models/user.rbapp/models/review.rb100.00 % 16 7 7app/models/user.rbapp/models/review.rb100.00 %8 2 2100.00 % 16app/models/user.rb 100.00 % 8app/models/coupon.rb 100.00 % 32 216 7 70 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16 7 7app/models/review.rbapp/models/review.rbapp/models/review.rbapp/models/review.rb100.00 % 167 7app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16app/models/user.rb 100.00 %app/models/user.rb 100.00 % 8 2 2 0 1.00
app/queries/book_query.rb 87.50 % 1582 2 0 1.00app/models/user.rb 100.00 % 8 2 2
app/models/order.rb 100.00 % 6 4 40 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 1677 0 1.001 7.507 1 7.25
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.50
app/queries/book_query.rb 87.50 % 15 8app/queries/book_query.rb 87.50 % 15 87 70 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7 1app/models/shipping.rb 100.00 % 2 117.507.507.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.257.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.25app/models/shipping.rb 100.00 % 2 1 1 0 1.00app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16 7 7app/models/review.rb100.00 % 16 7 70 1.00
app/queries/book_query.rb 87.50 % 15 8 7 17.507.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.257.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.25app/models/shipping.rb 100.00 % 2 1 1 0 1.007.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30app/queries/book_query.rb 85.71 % 13 7 6 1 8.14
app/models/user.rb 53.85 % 22 13 7 6 0.54
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/services/book_service.rb 88.89 % 19 9 8 1 1.56
app/services/coupon_service.rb 100.00 % 19 8 8 0 2.25
config/application.rb 100.00 % 22 6 6 0 1.00
config/boot.rb 100.00 % 4 3 3 0 1.00
config/environment.rb 100.00 % 5 2 2 0 1.00
config/environments/test.rb 100.00 % 6019 19 0 1.00
config/initializers/active_admin.rb 100.00 % 12 11 1118 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 180 1.00
config/initializers/application_controller_renderer.rb 100.00 % 8 0 0 0 0.00
config/initializers/assets.rb 100.00 % 14 2 2 0 1.00
config/initializers/backtrace_silencers.rb 100.00 % 8 1 1 0 1.00
config/initializers/content_security_policy.rb 100.00 % 30 0 0 0 0.00
config/initializers/cookies_serializer.rb 100.00 % 5 1 1 0 1.00
config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 % 311 13 1320 14 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 20 14 140 1.00
config/initializers/filter_parameter_logging.rb 100.00 % 6 1 1 0 1.00
config/initializers/inflections.rb 100.00 % 16 0 0 0 0.00
config/initializers/kaminari.rb 100.00 % 3 2 2 0 1.00
config/initializers/mime_types.rb 100.00 % 4 0 0 0 0.00
config/initializers/omniauth.rbconfig/initializers/omniauth.rbconfig/initializers/money.rbconfig/initializers/money.rbconfig/initializers/money.rb100.00 % 32 23 3config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 33 32 23 30 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 32 23 3config/initializers/omniauth.rb 100.00 % 3 2 23 33 3config/initializers/omniauth.rb 100.00 % 3 2 20 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3config/initializers/omniauth.rb 100.00 % 3 2 20 1.00
config/initializers/permissions_policy.rb 100.00 % 11 0 0 0 0.00
config/initializers/wrap_parameters.rb 100.00 % 14 2 2 0 1.50
config/routes.rb 100.00 %7 4 45 3 317 9 917 9 95 3 37 4 45 3 37 4 417 9 917 9 917 9 95 3 35 3 35 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 431 17 1717 9 95 3 37 4 45 3 35 3 37 4 417 9 90 1.00
spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 0 1.60spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 01.291.60spec/decorators/author_decorator_spec.rb 100.00 % 13 7 7 0 1.29
spec/decorators/book_decorator_spec.rb 100.00 % 36 15 15 01.73
spec/factories/addresses.rb 100.00 % 4 2 2 0 1.001.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.73
spec/factories/admin_users.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/addresses.rb 100.00 % 4 2 2 0 1.00
spec/factories/admin_users.rbspec/factories/authors.rbspec/factories/addresses.rb 100.00 % 4 2 2 0 1.00
spec/factories/admin_users.rb100.00 % 6 4 4 08.007.007.008.001.008.008.008.00
spec/factories/authors.rb 80.00 % 18 108 2 2.508 2 2.508 2 2.50spec/factories/authors.rbspec/factories/authors.rb100.00 % 6 4 4 01.007 3 0.708 2 2.507 3 0.708 2 2.507.001.008.00
spec/factories/authors.rb 80.00 % 18 108 2 2.50spec/factories/authors.rb 100.00 % 6 4 4 0 1.007 3 0.708 2 2.501.00
spec/factories/authors_books.rb 100.00 % 6 4 4 0 1.00
spec/factories/billings.rb 100.00 % 10 8 8 01.001.002.5669.562.5668.002.5668.002.5668.002.5669.561.001.001.001.00
spec/factories/books.rb 80.95 % 35 2117 4 45.52spec/factories/books.rbspec/factories/billings.rb100.00 % 10 8 8 068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5615 6 0.7117 446.3845.5217 446.3817 446.38spec/factories/books.rb 100.00 % 11 9 9 068.0068.002.5669.562.5668.0046.3868.002.5668.002.5668.0068.002.5669.5668.002.5669.5615 6 0.7117 4 46.38spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.562.5668.002.562.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.621.0068.0069.5615 6 0.71
spec/factories/books_categories.rbspec/factories/books_categories.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books.rb 80.95 % 35 21 17 4 45.5217 4 46.3845.52spec/factories/books.rb 100.00 % 11 9 9 068.0068.002.5669.562.5668.00
spec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rb100.00 % 6 4 4 0 1.00
spec/factories/categories.rb 100.00 % 5 3 3 04.671.001.003.333.333.334.674.673.333.333.331.004.674.674.674.673.333.333.331.004.671.004.673.333.333.333.333.334.674.673.333.333.331.004.674.67
spec/factories/users.rbspec/factories/reviews.rb100.00 % 7 5 5spec/factories/users.rbspec/factories/reviews.rb100.00 %4 2 20 1.00spec/factories/users.rb 100.00 % 4 2 27 5 5spec/factories/coupons.rb 100.00 % 8 6 6 0 2.50
spec/factories/order_books.rb 100.00 % 7 5 5 0 1.80
spec/factories/orders.rb 77.78 % 17 9 7 2 1.56
spec/factories/reviews.rb100.00 % 7 5 5spec/factories/users.rb 100.00 % 4 2 27 5 50 1.00spec/factories/users.rbspec/factories/reviews.rb100.00 % 7 5 5spec/factories/users.rb 100.00 % 4 2 20 1.00
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.38
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 0 11.00
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 % 61 32 32 0 1.41
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.33
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.00
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/home_spec.rb 100.00 %96 49 49 0 1.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.05
spec/models/author_spec.rb 100.00 %13 8 8 0 1.50
spec/models/authors_book_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 9 0 1.44
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.381.001.001.00
spec/feature/book_spec.rb1.00
spec/models/user_spec.rb100.00 % 202 105 105 02.371.001.53
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.380 1.00
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.0013.40
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.33
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.00
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/cart_spec.rb 96.55 % 56 29 28 1 1.41
spec/feature/coupon_spec.rb 100.00 % 50 30 30 0 2.17
spec/feature/home_spec.rb 100.00 %96 49 49 0 1.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.05
spec/models/author_spec.rb 100.00 %13 8 8 0 1.50
spec/models/authors_book_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/order_spec.rb 100.00 % 10 6 6 0 1.33
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 913 8 80 1.50
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.381.381.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.531.53
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.53spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3spec/support/configs/capybara.rb100.00 %36.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 190 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.00
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.001.001.001.00
spec/support/configs/capybara.rb100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %36.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 19 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.00100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919191919 0 1.007 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.37100.00 %36.84 % 29 19 7 12 0.37100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.00
spec/support/configs/shoulda_matcher.rb 100.00 %888899999899999998999988985 5 0 1.00
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

app/admin/admin_users.rb

40.0% lines covered

20 relevant lines. 8 lines covered and 12 lines missed.
    
  1. 1 ActiveAdmin.register AdminUser do
  2. 1 permit_params :email, :password, :password_confirmation
  3. 1 index do
  4. selectable_column
  5. id_column
  6. column :email
  7. column :current_sign_in_at
  8. column :sign_in_count
  9. column :created_at
  10. actions
  11. end
  12. 1 filter :email
  13. 1 filter :current_sign_in_at
  14. 1 filter :sign_in_count
  15. 1 filter :created_at
  16. 1 form do |f|
  17. f.inputs do
  18. f.input :email
  19. f.input :password
  20. f.input :password_confirmation
  21. end
  22. f.actions
  23. end
  24. end

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Author do
  2. 1 config.filters = true
  3. 1 permit_params :first_name, :last_name
  4. 1 filter :books, collection: Book.all
  5. 1 filter :first_name
  6. 1 filter :last_name
  7. 1 index do
  8. 3 selectable_column
  9. 3 column :first_name
  10. 3 column :last_name
  11. 3 actions
  12. end
  13. 1 show do
  14. 3 attributes_table do
  15. 3 row :first_name
  16. 3 row :last_name
  17. 3 row :books
  18. end
  19. end
  20. 1 form do |f|
  21. 2 f.inputs do
  22. 2 f.input :first_name
  23. 2 f.input :last_name
  24. 2 f.input :books, as: :select, collection: Book.all
  25. end
  26. 2 f.actions
  27. end
  28. end

app/admin/books.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 41 relevant lines. 41 lines covered and ======= 51 relevant lines. 51 lines covered and >>>>>>> b28889f (Fix) 0 lines missed. ======= 51 relevant lines. <<<<<<< HEAD 11 lines covered and 40 lines missed. >>>>>>> 49e8a6c (Rebased) ======= 51 lines covered and 0 lines missed. >>>>>>> 872e675 (Fix) ======= 41 relevant lines. 41 lines covered and 0 lines missed. >>>>>>> c7a726c5 (Rebased)
    
  1. 1 ActiveAdmin.register Book do
  2. 1 permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
  3. <<<<<<< HEAD author_ids: [], category_ids: [], images: [] ======= category_ids: [], author_ids: [] >>>>>>> c7a726c5 (Rebased)
  4. 1 decorate_with BookDecorator
  5. 1 filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
  6. 1 filter :categories
  7. 1 filter :title
  8. 1 filter :year_of_publication
  9. 1 index do
  10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  11. 4 =======
  12. 6 >>>>>>> b28889f (Fix) =======
  13. >>>>>>> 49e8a6c (Rebased) =======
  14. 6 >>>>>>> 872e675 (Fix) =======
  15. 4 >>>>>>> c7a726c5 (Rebased) selectable_column
  16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  17. 4 =======
  18. 6 =======
  19. >>>>>>> 49e8a6c (Rebased) =======
  20. 6 >>>>>>> 872e675 (Fix) column :categories, &:categories_names
  21. <<<<<<< HEAD <<<<<<< HEAD
  22. 6 >>>>>>> b28889f (Fix) =======
  23. >>>>>>> 49e8a6c (Rebased) =======
  24. 6 >>>>>>> 872e675 (Fix) =======
  25. 4 >>>>>>> c7a726c5 (Rebased) column :title
  26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  27. 4 =======
  28. 6 >>>>>>> b28889f (Fix) =======
  29. 4 >>>>>>> c7a726c5 (Rebased) column :year_of_publication
  30. <<<<<<< HEAD <<<<<<< HEAD
  31. 4 =======
  32. 6 >>>>>>> b28889f (Fix) =======
  33. 4 >>>>>>> c7a726c5 (Rebased) column :materials
  34. <<<<<<< HEAD <<<<<<< HEAD
  35. 4 =======
  36. 6 >>>>>>> b28889f (Fix) =======
  37. 4 >>>>>>> c7a726c5 (Rebased) column :dimensions
  38. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased)
  39. 4 column :price_cents, &:price
  40. 4 <<<<<<< HEAD =======
  41. 6 >>>>>>> b28889f (Fix) ======= >>>>>>> c7a726c5 (Rebased) column :quantity
  42. 4 <<<<<<< HEAD =======
  43. >>>>>>> 49e8a6c (Rebased) =======
  44. 6 >>>>>>> 872e675 (Fix) ======= >>>>>>> c7a726c5 (Rebased) column :authors, &:authors_names
  45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  46. 4 =======
  47. 6 >>>>>>> b28889f (Fix) =======
  48. >>>>>>> 49e8a6c (Rebased) =======
  49. 6 >>>>>>> 872e675 (Fix) =======
  50. 4 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD column :description
  51. 6 column :price, &:price
  52. 6 column :quantity
  53. 6 actions ======= column :categories, &:categories_names >>>>>>> c7a726c5 (Rebased)
  54. <<<<<<< HEAD =======
  55. 4 actions
  56. >>>>>>> c7a726c5 (Rebased) end
  57. <<<<<<< HEAD
  58. =======
  59. >>>>>>> c7a726c5 (Rebased)
  60. <<<<<<< HEAD
  61. =======
  62. >>>>>>> c7a726c5 (Rebased) 1 show do
  63. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  64. 3 =======
  65. 5 >>>>>>> b28889f (Fix) =======
  66. >>>>>>> 49e8a6c (Rebased) =======
  67. 5 >>>>>>> 872e675 (Fix) =======
  68. 3 >>>>>>> c7a726c5 (Rebased) attributes_table do
  69. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  70. 3 =======
  71. 5 >>>>>>> b28889f (Fix) =======
  72. >>>>>>> 49e8a6c (Rebased) =======
  73. 5 >>>>>>> 872e675 (Fix) =======
  74. 3 >>>>>>> c7a726c5 (Rebased) row :authors, &:authors_names
  75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  76. 3 =======
  77. 5 >>>>>>> b28889f (Fix) =======
  78. >>>>>>> 49e8a6c (Rebased) =======
  79. 5 >>>>>>> 872e675 (Fix) =======
  80. 3 >>>>>>> c7a726c5 (Rebased) row :categories, &:categories_names
  81. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  82. 3 =======
  83. 5 >>>>>>> b28889f (Fix) =======
  84. >>>>>>> 49e8a6c (Rebased) =======
  85. 5 >>>>>>> 872e675 (Fix) =======
  86. 3 >>>>>>> c7a726c5 (Rebased) row :year_of_publication
  87. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  88. 3 =======
  89. 5 >>>>>>> b28889f (Fix) =======
  90. >>>>>>> 49e8a6c (Rebased) =======
  91. 5 >>>>>>> 872e675 (Fix) =======
  92. 3 >>>>>>> c7a726c5 (Rebased) row :description
  93. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  94. 3 =======
  95. 5 >>>>>>> b28889f (Fix) =======
  96. >>>>>>> 49e8a6c (Rebased) =======
  97. 5 >>>>>>> 872e675 (Fix) =======
  98. 3 >>>>>>> c7a726c5 (Rebased) row :materials
  99. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  100. 3 =======
  101. 5 >>>>>>> b28889f (Fix) =======
  102. >>>>>>> 49e8a6c (Rebased) =======
  103. 5 >>>>>>> 872e675 (Fix) =======
  104. 3 >>>>>>> c7a726c5 (Rebased) row :dimensions
  105. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  106. 3 =======
  107. 5 >>>>>>> b28889f (Fix) =======
  108. >>>>>>> 49e8a6c (Rebased) =======
  109. 5 >>>>>>> 872e675 (Fix) =======
  110. 3 >>>>>>> c7a726c5 (Rebased) row :price, &:price
  111. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  112. 3 =======
  113. 5 >>>>>>> b28889f (Fix) =======
  114. >>>>>>> 49e8a6c (Rebased) =======
  115. 5 >>>>>>> 872e675 (Fix) =======
  116. 3 >>>>>>> c7a726c5 (Rebased) row :created_at
  117. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  118. 3 =======
  119. 5 >>>>>>> b28889f (Fix) =======
  120. >>>>>>> 49e8a6c (Rebased) =======
  121. 5 >>>>>>> 872e675 (Fix) =======
  122. 3 >>>>>>> c7a726c5 (Rebased) row :updated_at
  123. <<<<<<< HEAD
  124. =======
  125. >>>>>>> c7a726c5 (Rebased) end
  126. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  127. =======
  128. 5 <<<<<<< HEAD panel :images do
  129. 5 table do
  130. 5 book.images.each do |image|
  131. 2 span image_tag image.variant(resize_to_limit: [100, 100])
  132. end
  133. end
  134. end
  135. >>>>>>> b28889f (Fix) =======
  136. >>>>>>> c7a726c5 (Rebased) end
  137. <<<<<<< HEAD =======
  138. >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> c7a726c5 (Rebased)
  139. <<<<<<< HEAD
  140. ======= >>>>>>> 872e675 (Fix) panel :images do
  141. 5 table do
  142. 5 book.images.each do |image|
  143. 2 span image_tag image.variant(resize_to_limit: [100, 100])
  144. end
  145. end
  146. end
  147. end
  148. =======
  149. >>>>>>> c7a726c5 (Rebased) 1 form do |f|
  150. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  151. 2 =======
  152. 6 >>>>>>> b28889f (Fix) =======
  153. >>>>>>> 49e8a6c (Rebased) =======
  154. 6 >>>>>>> 872e675 (Fix) =======
  155. 2 >>>>>>> c7a726c5 (Rebased) f.inputs do
  156. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  157. 2 =======
  158. 6 >>>>>>> b28889f (Fix) =======
  159. >>>>>>> 49e8a6c (Rebased) =======
  160. 6 >>>>>>> 872e675 (Fix) =======
  161. 2 >>>>>>> c7a726c5 (Rebased) f.input :title
  162. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  163. 2 =======
  164. 6 =======
  165. >>>>>>> 49e8a6c (Rebased) =======
  166. 6 >>>>>>> 872e675 (Fix) f.input :description
  167. <<<<<<< HEAD <<<<<<< HEAD
  168. 6 >>>>>>> b28889f (Fix) =======
  169. >>>>>>> 49e8a6c (Rebased) =======
  170. 6 >>>>>>> 872e675 (Fix) =======
  171. 2 >>>>>>> c7a726c5 (Rebased) f.input :year_of_publication
  172. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  173. 2 =======
  174. 6 >>>>>>> b28889f (Fix) =======
  175. >>>>>>> 49e8a6c (Rebased) =======
  176. 6 >>>>>>> 872e675 (Fix) =======
  177. 2 >>>>>>> c7a726c5 (Rebased) f.input :price_cents
  178. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  179. 2 =======
  180. 6 >>>>>>> b28889f (Fix) =======
  181. >>>>>>> 49e8a6c (Rebased) =======
  182. 6 >>>>>>> 872e675 (Fix) =======
  183. 2 >>>>>>> c7a726c5 (Rebased) f.input :materials
  184. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  185. 2 =======
  186. 6 >>>>>>> b28889f (Fix) =======
  187. >>>>>>> 49e8a6c (Rebased) =======
  188. 6 >>>>>>> 872e675 (Fix) =======
  189. 2 >>>>>>> c7a726c5 (Rebased) f.input :dimensions
  190. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  191. 2 =======
  192. 6 >>>>>>> b28889f (Fix) =======
  193. >>>>>>> 49e8a6c (Rebased) =======
  194. 6 >>>>>>> 872e675 (Fix) =======
  195. 2 >>>>>>> c7a726c5 (Rebased) f.input :quantity
  196. <<<<<<< HEAD =======
  197. 2 f.input :description, as: :text
  198. 2 f.input :categories, as: :select, collection: Category.all
  199. 2 f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  200. end
  201. 2 f.actions
  202. >>>>>>> c7a726c5 (Rebased)
  203. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 49e8a6c (Rebased)
  204. <<<<<<< HEAD <<<<<<< HEAD
  205. 6 =======
  206. >>>>>>> 49e8a6c (Rebased) =======
  207. 6 >>>>>>> 872e675 (Fix) f.input :categories, as: :select, collection: Category.all
  208. <<<<<<< HEAD <<<<<<< HEAD
  209. 6 =======
  210. >>>>>>> 49e8a6c (Rebased) =======
  211. 6 >>>>>>> 872e675 (Fix) f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  212. <<<<<<< HEAD <<<<<<< HEAD
  213. 6 =======
  214. >>>>>>> 49e8a6c (Rebased) =======
  215. 6 >>>>>>> 872e675 (Fix) f.input :images, as: :file, input_html: { multiple: true }
  216. end
  217. <<<<<<< HEAD <<<<<<< HEAD
  218. 6 =======
  219. >>>>>>> 49e8a6c (Rebased) =======
  220. 6 >>>>>>> 872e675 (Fix) panel :images do
  221. <<<<<<< HEAD <<<<<<< HEAD
  222. 6 =======
  223. >>>>>>> 49e8a6c (Rebased) =======
  224. 6 >>>>>>> 872e675 (Fix) f.object.images.each do |image|
  225. <<<<<<< HEAD <<<<<<< HEAD
  226. 1 =======
  227. >>>>>>> 49e8a6c (Rebased) =======
  228. 1 >>>>>>> 872e675 (Fix) span image_tag image.variant(resize_to_limit: [100, 100])
  229. <<<<<<< HEAD <<<<<<< HEAD
  230. 1 =======
  231. >>>>>>> 49e8a6c (Rebased) =======
  232. 1 >>>>>>> 872e675 (Fix) span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
  233. data: { confirm: "Delete #{image.filename}?" })
  234. end
  235. end
  236. <<<<<<< HEAD <<<<<<< HEAD
  237. 6 =======
  238. >>>>>>> 49e8a6c (Rebased) =======
  239. 6 >>>>>>> 872e675 (Fix) f.actions
  240. <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> c7a726c5 (Rebased) end
  241. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  242. ======= ======= >>>>>>> 49e8a6c (Rebased)
  243. 1 member_action :delete_image, method: :delete do
  244. <<<<<<< HEAD <<<<<<< HEAD
  245. 1 =======
  246. >>>>>>> 49e8a6c (Rebased) =======
  247. 1 >>>>>>> 872e675 (Fix) ActiveStorage::Attachment.find(params[:id]).destroy
  248. <<<<<<< HEAD <<<<<<< HEAD
  249. 1 =======
  250. >>>>>>> 49e8a6c (Rebased) =======
  251. 1 >>>>>>> 872e675 (Fix) redirect_back(fallback_location: edit_admin_book_path)
  252. end
  253. <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) =======
  254. >>>>>>> c7a726c5 (Rebased) end

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Category do
  2. 1 permit_params :name, book_ids: []
  3. 1 filter :books, collection: Book.all
  4. 1 filter :name
  5. 1 index do
  6. 4 selectable_column
  7. 4 column :name
  8. 4 actions
  9. end
  10. 1 show do
  11. 3 attributes_table do
  12. 3 row :name
  13. 3 row :created_at
  14. 3 row :updated_at
  15. end
  16. end
  17. 1 form do |f|
  18. 2 f.inputs do
  19. 2 f.input :name
  20. 2 f.input :books, as: :select, collection: Book.all
  21. end
  22. 2 f.actions
  23. end
  24. end

app/admin/dashboard.rb

42.86% lines covered

7 relevant lines. 3 lines covered and 4 lines missed.
    
  1. # frozen_string_literal: true
  2. 1 ActiveAdmin.register_page 'Dashboard' do
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 31 =======
  5. 39 >>>>>>> b28889f (Fix) =======
  6. 1 >>>>>>> 49e8a6c (Rebased) =======
  7. 39 >>>>>>> 872e675 (Fix) =======
  8. 31 >>>>>>> c7a726c5 (Rebased) menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
  9. 1 content title: proc { I18n.t('active_admin.dashboard') } do
  10. div class: 'blank_slate_container', id: 'dashboard_default_message' do
  11. span class: 'blank_slate' do
  12. span I18n.t('active_admin.dashboard_welcome.welcome')
  13. small I18n.t('active_admin.dashboard_welcome.call_to_action')
  14. end
  15. end
  16. end
  17. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased)

app/admin/admin_users.rb

40.0% lines covered

20 relevant lines. 8 lines covered and 12 lines missed.
    
  1. 1 ActiveAdmin.register AdminUser do
  2. 1 permit_params :email, :password, :password_confirmation
  3. 1 index do
  4. selectable_column
  5. id_column
  6. column :email
  7. column :current_sign_in_at
  8. column :sign_in_count
  9. column :created_at
  10. actions
  11. end
  12. 1 filter :email
  13. 1 filter :current_sign_in_at
  14. 1 filter :sign_in_count
  15. 1 filter :created_at
  16. 1 form do |f|
  17. f.inputs do
  18. f.input :email
  19. f.input :password
  20. f.input :password_confirmation
  21. end
  22. f.actions
  23. end
  24. end

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Author do
  2. 1 config.filters = true
  3. 1 permit_params :first_name, :last_name
  4. 1 filter :books, collection: Book.all
  5. 1 filter :first_name
  6. 1 filter :last_name
  7. 1 index do
  8. 3 selectable_column
  9. 3 column :first_name
  10. 3 column :last_name
  11. 3 actions
  12. end
  13. 1 show do
  14. 3 attributes_table do
  15. 3 row :first_name
  16. 3 row :last_name
  17. 3 row :books
  18. end
  19. end
  20. 1 form do |f|
  21. 2 f.inputs do
  22. 2 f.input :first_name
  23. 2 f.input :last_name
  24. 2 f.input :books, as: :select, collection: Book.all
  25. end
  26. 2 f.actions
  27. end
  28. end

app/admin/books.rb

100.0% lines covered

51 relevant lines. <<<<<<< HEAD <<<<<<< HEAD 51 lines covered and 0 lines missed. ======= 11 lines covered and 40 lines missed. >>>>>>> 11792758 (Rebased) ======= 51 lines covered and 0 lines missed. >>>>>>> 31d15e66 (Fix)
    
  1. 1 ActiveAdmin.register Book do
  2. 1 permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
  3. author_ids: [], category_ids: [], images: []
  4. 1 decorate_with BookDecorator
  5. 1 filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
  6. 1 filter :categories
  7. 1 filter :title
  8. 1 filter :year_of_publication
  9. 1 index do
  10. <<<<<<< HEAD <<<<<<< HEAD
  11. 6 =======
  12. >>>>>>> 11792758 (Rebased) =======
  13. 6 >>>>>>> 31d15e66 (Fix) selectable_column
  14. <<<<<<< HEAD <<<<<<< HEAD
  15. 6 =======
  16. >>>>>>> 11792758 (Rebased) =======
  17. 6 >>>>>>> 31d15e66 (Fix) column :categories, &:categories_names
  18. <<<<<<< HEAD <<<<<<< HEAD
  19. 6 =======
  20. >>>>>>> 11792758 (Rebased) =======
  21. 6 >>>>>>> 31d15e66 (Fix) column :title
  22. <<<<<<< HEAD <<<<<<< HEAD
  23. 6 =======
  24. >>>>>>> 11792758 (Rebased) =======
  25. 6 >>>>>>> 31d15e66 (Fix) column :authors, &:authors_names
  26. <<<<<<< HEAD <<<<<<< HEAD
  27. 6 =======
  28. >>>>>>> 11792758 (Rebased) =======
  29. 6 >>>>>>> 31d15e66 (Fix) column :description
  30. <<<<<<< HEAD <<<<<<< HEAD
  31. 6 =======
  32. >>>>>>> 11792758 (Rebased) =======
  33. 6 >>>>>>> 31d15e66 (Fix) column :price, &:price
  34. <<<<<<< HEAD <<<<<<< HEAD
  35. 6 =======
  36. >>>>>>> 11792758 (Rebased) =======
  37. 6 >>>>>>> 31d15e66 (Fix) column :quantity
  38. <<<<<<< HEAD <<<<<<< HEAD
  39. 6 =======
  40. >>>>>>> 11792758 (Rebased) =======
  41. 6 >>>>>>> 31d15e66 (Fix) actions
  42. end
  43. 1 show do
  44. <<<<<<< HEAD <<<<<<< HEAD
  45. 5 =======
  46. >>>>>>> 11792758 (Rebased) =======
  47. 5 >>>>>>> 31d15e66 (Fix) attributes_table do
  48. <<<<<<< HEAD <<<<<<< HEAD
  49. 5 =======
  50. >>>>>>> 11792758 (Rebased) =======
  51. 5 >>>>>>> 31d15e66 (Fix) row :authors, &:authors_names
  52. <<<<<<< HEAD <<<<<<< HEAD
  53. 5 =======
  54. >>>>>>> 11792758 (Rebased) =======
  55. 5 >>>>>>> 31d15e66 (Fix) row :categories, &:categories_names
  56. <<<<<<< HEAD <<<<<<< HEAD
  57. 5 =======
  58. >>>>>>> 11792758 (Rebased) =======
  59. 5 >>>>>>> 31d15e66 (Fix) row :year_of_publication
  60. <<<<<<< HEAD <<<<<<< HEAD
  61. 5 =======
  62. >>>>>>> 11792758 (Rebased) =======
  63. 5 >>>>>>> 31d15e66 (Fix) row :description
  64. <<<<<<< HEAD <<<<<<< HEAD
  65. 5 =======
  66. >>>>>>> 11792758 (Rebased) =======
  67. 5 >>>>>>> 31d15e66 (Fix) row :materials
  68. <<<<<<< HEAD <<<<<<< HEAD
  69. 5 =======
  70. >>>>>>> 11792758 (Rebased) =======
  71. 5 >>>>>>> 31d15e66 (Fix) row :dimensions
  72. <<<<<<< HEAD <<<<<<< HEAD
  73. 5 =======
  74. >>>>>>> 11792758 (Rebased) =======
  75. 5 >>>>>>> 31d15e66 (Fix) row :price, &:price
  76. <<<<<<< HEAD <<<<<<< HEAD
  77. 5 =======
  78. >>>>>>> 11792758 (Rebased) =======
  79. 5 >>>>>>> 31d15e66 (Fix) row :created_at
  80. <<<<<<< HEAD <<<<<<< HEAD
  81. 5 =======
  82. >>>>>>> 11792758 (Rebased) =======
  83. 5 >>>>>>> 31d15e66 (Fix) row :updated_at
  84. end
  85. <<<<<<< HEAD <<<<<<< HEAD
  86. 5 =======
  87. >>>>>>> 11792758 (Rebased) =======
  88. 5 >>>>>>> 31d15e66 (Fix) panel :images do
  89. <<<<<<< HEAD <<<<<<< HEAD
  90. 5 =======
  91. >>>>>>> 11792758 (Rebased) =======
  92. 5 >>>>>>> 31d15e66 (Fix) table do
  93. <<<<<<< HEAD <<<<<<< HEAD
  94. 5 =======
  95. >>>>>>> 11792758 (Rebased) =======
  96. 5 >>>>>>> 31d15e66 (Fix) book.images.each do |image|
  97. <<<<<<< HEAD <<<<<<< HEAD
  98. 2 =======
  99. >>>>>>> 11792758 (Rebased) =======
  100. 2 >>>>>>> 31d15e66 (Fix) span image_tag image.variant(resize_to_limit: [100, 100])
  101. end
  102. end
  103. end
  104. end
  105. 1 form do |f|
  106. <<<<<<< HEAD <<<<<<< HEAD
  107. 6 =======
  108. >>>>>>> 11792758 (Rebased) =======
  109. 6 >>>>>>> 31d15e66 (Fix) f.inputs do
  110. <<<<<<< HEAD <<<<<<< HEAD
  111. 6 =======
  112. >>>>>>> 11792758 (Rebased) =======
  113. 6 >>>>>>> 31d15e66 (Fix) f.input :title
  114. <<<<<<< HEAD <<<<<<< HEAD
  115. 6 =======
  116. >>>>>>> 11792758 (Rebased) =======
  117. 6 >>>>>>> 31d15e66 (Fix) f.input :description
  118. <<<<<<< HEAD <<<<<<< HEAD
  119. 6 =======
  120. >>>>>>> 11792758 (Rebased) =======
  121. 6 >>>>>>> 31d15e66 (Fix) f.input :year_of_publication
  122. <<<<<<< HEAD <<<<<<< HEAD
  123. 6 =======
  124. >>>>>>> 11792758 (Rebased) =======
  125. 6 >>>>>>> 31d15e66 (Fix) f.input :price_cents
  126. <<<<<<< HEAD <<<<<<< HEAD
  127. 6 =======
  128. >>>>>>> 11792758 (Rebased) =======
  129. 6 >>>>>>> 31d15e66 (Fix) f.input :materials
  130. <<<<<<< HEAD <<<<<<< HEAD
  131. 6 =======
  132. >>>>>>> 11792758 (Rebased) =======
  133. 6 >>>>>>> 31d15e66 (Fix) f.input :dimensions
  134. <<<<<<< HEAD <<<<<<< HEAD
  135. 6 =======
  136. >>>>>>> 11792758 (Rebased) =======
  137. 6 >>>>>>> 31d15e66 (Fix) f.input :quantity
  138. <<<<<<< HEAD <<<<<<< HEAD
  139. 6 =======
  140. >>>>>>> 11792758 (Rebased) =======
  141. 6 >>>>>>> 31d15e66 (Fix) f.input :categories, as: :select, collection: Category.all
  142. <<<<<<< HEAD <<<<<<< HEAD
  143. 6 =======
  144. >>>>>>> 11792758 (Rebased) =======
  145. 6 >>>>>>> 31d15e66 (Fix) f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  146. <<<<<<< HEAD <<<<<<< HEAD
  147. 6 =======
  148. >>>>>>> 11792758 (Rebased) =======
  149. 6 >>>>>>> 31d15e66 (Fix) f.input :images, as: :file, input_html: { multiple: true }
  150. end
  151. <<<<<<< HEAD <<<<<<< HEAD
  152. 6 =======
  153. >>>>>>> 11792758 (Rebased) =======
  154. 6 >>>>>>> 31d15e66 (Fix) panel :images do
  155. <<<<<<< HEAD <<<<<<< HEAD
  156. 6 =======
  157. >>>>>>> 11792758 (Rebased) =======
  158. 6 >>>>>>> 31d15e66 (Fix) f.object.images.each do |image|
  159. <<<<<<< HEAD <<<<<<< HEAD
  160. 1 =======
  161. >>>>>>> 11792758 (Rebased) =======
  162. 1 >>>>>>> 31d15e66 (Fix) span image_tag image.variant(resize_to_limit: [100, 100])
  163. <<<<<<< HEAD <<<<<<< HEAD
  164. 1 =======
  165. >>>>>>> 11792758 (Rebased) =======
  166. 1 >>>>>>> 31d15e66 (Fix) span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
  167. data: { confirm: "Delete #{image.filename}?" })
  168. end
  169. end
  170. <<<<<<< HEAD <<<<<<< HEAD
  171. 6 =======
  172. >>>>>>> 11792758 (Rebased) =======
  173. 6 >>>>>>> 31d15e66 (Fix) f.actions
  174. end
  175. 1 member_action :delete_image, method: :delete do
  176. <<<<<<< HEAD <<<<<<< HEAD
  177. 1 =======
  178. >>>>>>> 11792758 (Rebased) =======
  179. 1 >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD ActiveStorage::Attachment.find(params[:id]).purge_later ======= ActiveStorage::Attachment.find(params[:id]).destroy >>>>>>> 11792758 (Rebased)
  180. <<<<<<< HEAD <<<<<<< HEAD
  181. 1 =======
  182. >>>>>>> 11792758 (Rebased) =======
  183. 1 >>>>>>> 31d15e66 (Fix) redirect_back(fallback_location: edit_admin_book_path)
  184. end
  185. end

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Category do
  2. 1 permit_params :name, book_ids: []
  3. 1 filter :books, collection: Book.all
  4. 1 filter :name
  5. 1 index do
  6. 4 selectable_column
  7. 4 column :name
  8. 4 actions
  9. end
  10. 1 show do
  11. 3 attributes_table do
  12. 3 row :name
  13. 3 row :created_at
  14. 3 row :updated_at
  15. end
  16. end
  17. 1 form do |f|
  18. 2 f.inputs do
  19. 2 f.input :name
  20. 2 f.input :books, as: :select, collection: Book.all
  21. end
  22. 2 f.actions
  23. end
  24. end

app/admin/coupons.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Coupon do
  2. 1 permit_params :code, :is_active, :active_till_date, :discount, :order_id
  3. end

app/admin/dashboard.rb

44.44% lines covered

9 relevant lines. 4 lines covered and 5 lines missed.
    
  1. # frozen_string_literal: true
  2. 1 ActiveAdmin.register_page 'Dashboard' do
  3. <<<<<<< HEAD <<<<<<< HEAD
  4. 39 =======
  5. 1 >>>>>>> 11792758 (Rebased) =======
  6. 39 >>>>>>> 31d15e66 (Fix) menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
  7. 1 action_item only: :show do
  8. link_to 'SideKiq View', sidekiq_web_path
  9. end
  10. 1 content title: proc { I18n.t('active_admin.dashboard') } do
  11. div class: 'blank_slate_container', id: 'dashboard_default_message' do
  12. span class: 'blank_slate' do
  13. span I18n.t('active_admin.dashboard_welcome.welcome')
  14. small I18n.t('active_admin.dashboard_welcome.call_to_action')
  15. end
  16. end
  17. end
  18. end

app/admin/orders.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Order do
  2. 1 permit_params :user_id, :coupon_id, :total_price, :status, :last_action
  3. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

app/controllers/application_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed.
    
  1. 1 class ApplicationController < ActionController::Base
  2. 1 before_action :user_or_guest_have_order
  3. 1 private
  4. 1 def user_or_guest_have_order
  5. 164 if current_user
  6. 36 session[:order_id] = Order.find_or_create_by(user_id: current_user.id).id
  7. 36 CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
  8. 128 elsif session[:order_id].nil?
  9. 52 session[:order_id] = Order.create.id
  10. 52 CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
  11. end
  12. end
  13. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)

app/controllers/books_controller.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 93.33% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 93.33% ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 93.33% ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 93.75% >>>>>>> c4adab0 (Featire specs) ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= 93.75% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 93.75% >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 93.33% >>>>>>> c7a726c5 (Rebased) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= 93.75% >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 15 relevant lines. 14 lines covered and 1 lines missed. ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 15 relevant lines. 14 lines covered and 1 lines missed. ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> e3e66f3 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    
  1. 1 class BooksController < ApplicationController
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) def index ======= ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) def index ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> 9bfbd88 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 824bb2b (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> e3e66f3 (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. =======
  5. ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 752f0c0 (Featire specs) =======
  6. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) def index ======= <<<<<<< HEAD ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> 9bfbd88 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 824bb2b (Featire specs)
  7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 84003439 (Featire specs)
  8. <<<<<<< HEAD ======= =======
  9. >>>>>>> 752f0c0 (Featire specs) =======
  10. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) def index
  11. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  12. >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 009401d (Featire specs) 24 =======
  13. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  14. 24 >>>>>>> 08edf50 (Featire specs) =======
  15. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  16. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs)
  17. 25 =======
  18. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  19. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9d98d9ab (Featire specs) @books_count = Book.count
  20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
  21. =======
  22. >>>>>>> 752f0c0 (Featire specs) =======
  23. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  24. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  25. 24 >>>>>>> 08edf50 (Featire specs) =======
  26. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  27. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs)
  28. 25 =======
  29. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  30. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) @categories = Category.all
  31. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  32. 24 =======
  33. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  34. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  35. 25 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs)
  36. 25 =======
  37. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  38. >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= <<<<<<< HEAD <<<<<<< HEAD sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs)
  39. <<<<<<< HEAD
  40. ======= <<<<<<< HEAD <<<<<<< HEAD
  41. =======
  42. 24 >>>>>>> d0dc1f1 (Featire specs) =======
  43. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD per_page: Constants::PAGINATION_PER_PAGE) ======= <<<<<<< HEAD <<<<<<< HEAD per_page: Constants::PAGINATION_PER_PAGE) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> d0dc1f1 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs)
  44. =======
  45. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD =======
  46. >>>>>>> 0d6dd12 (Manifest_cache true) =======
  47. >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
  48. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  49. 25 =======
  50. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD =======
  51. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  52. 1 >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) def index
  53. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  54. 24 <<<<<<< HEAD ======= =======
  55. ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
  56. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) 25 <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  57. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  58. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  59. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs)
  60. 25 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  61. 25 =======
  62. 25 >>>>>>> 9620751 (Featire specs) =======
  63. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  64. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  65. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  66. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
  67. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  68. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs)
  69. 25 >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  70. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  71. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  72. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  73. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  74. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  75. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  76. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  77. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
  78. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
  79. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= =======
  80. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= =======
  81. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  82. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
  83. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) @books_count = Book.count
  84. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  85. 24 <<<<<<< HEAD ======= =======
  86. ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
  87. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) 25 <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  88. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  89. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  90. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs)
  91. 25 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  92. 25 =======
  93. 25 >>>>>>> 9620751 (Featire specs) =======
  94. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  95. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  96. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  97. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
  98. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  99. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs)
  100. 25 >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  101. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  102. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  103. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  104. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  105. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  106. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  107. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  108. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
  109. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
  110. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= =======
  111. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= =======
  112. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  113. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
  114. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) @categories = Category.all
  115. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  116. 24 <<<<<<< HEAD ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c7a726c5 (Rebased)
  117. 24 =======
  118. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  119. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  120. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
  121. 25 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  122. 25 =======
  123. 25 >>>>>>> 9620751 (Featire specs) =======
  124. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  125. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  126. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  127. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
  128. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  129. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  130. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  131. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
  132. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> b832d45 (Featire specs) ======= =======
  133. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
  134. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= =======
  135. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  136. <<<<<<< HEAD
  137. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  138. =======
  139. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) =======
  140. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  141. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) =======
  142. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
  143. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) =======
  144. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  145. 24 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
  146. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) per_page: PAGINATION_PER_PAGE) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) per_page: Constants::PAGINATION_PER_PAGE) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  147. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  148. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) @books = BookDecorator.decorate_collection(sorted_books) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> f182ac7 (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> e3e66f3 (Featire specs) ======= def index ======= def index
  149. 25 @books_count = Book.count
  150. 25 @categories = Category.all
  151. 25 =======
  152. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= =======
  153. 25 >>>>>>> 730a8ca (Add login registration pages) =======
  154. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
  155. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) sorted_books = BookQuery.query(params).paginate(page: params[:page],
  156. per_page: PAGINATION_PER_PAGE) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
  157. 25 @books_count = Book.count
  158. 25 @categories = Category.all
  159. 25 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
  160. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) =======
  161. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) =======
  162. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) =======
  163. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  164. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  165. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= =======
  166. 25 >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) sorted_books = BookQuery.query(params).paginate(page: params[:page],
  167. <<<<<<< HEAD per_page: PAGINATION_PER_PAGE) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 31d15e66 (Fix) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  168. <<<<<<< HEAD
  169. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  170. >>>>>>> 752f0c0 (Featire specs) =======
  171. >>>>>>> 4e81ea2 (Featire specs) =======
  172. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> ae884b47 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  173. >>>>>>> c7a726c5 (Rebased)
  174. 25 <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) def index
  175. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  176. 24 <<<<<<< HEAD ======= =======
  177. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  178. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) @books_count = Book.count
  179. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  180. 24 <<<<<<< HEAD ======= =======
  181. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  182. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) @categories = Category.all
  183. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  184. 24 sorted_books = BookQuery.query(params).paginate(page: params[:page],
  185. per_page: PAGINATION_PER_PAGE) >>>>>>> 9bfbd88 (Featire specs)
  186. <<<<<<< HEAD ======= =======
  187. >>>>>>> 752f0c0 (Featire specs) =======
  188. >>>>>>> 4e81ea2 (Featire specs) =======
  189. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  190. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
  191. =======
  192. >>>>>>> 752f0c0 (Featire specs) =======
  193. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  194. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  195. 24 >>>>>>> 08edf50 (Featire specs) =======
  196. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs)
  197. 24 <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages)
  198. 25 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs)
  199. 25 <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  200. 25 >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) =======
  201. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  202. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 84003439 (Featire specs) =======
  203. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) @books = BookDecorator.decorate_collection(sorted_books) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= @books = BookDecorator.decorate_collection(sorted_books) ======= ======= >>>>>>> ebcdce06 (Featire specs) @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  204. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs)
  205. ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  206. ======= ======= >>>>>>> ebcdce06 (Featire specs)
  207. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs)
  208. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  209. >>>>>>> 752f0c0 (Featire specs) =======
  210. >>>>>>> 4e81ea2 (Featire specs) =======
  211. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) =======
  212. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  213. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  214. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
  215. =======
  216. >>>>>>> 752f0c0 (Featire specs) =======
  217. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  218. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  219. 24 >>>>>>> 08edf50 (Featire specs) =======
  220. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  221. 25 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  222. 24 <<<<<<< HEAD ======= =======
  223. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  224. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  225. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) =======
  226. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
  227. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) =======
  228. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= =======
  229. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
  230. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
  231. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  232. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
  233. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) =======
  234. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  235. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  236. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  237. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books)
  238. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages)
  239. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= =======
  240. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
  241. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
  242. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= =======
  243. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
  244. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  245. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= =======
  246. 25 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs)
  247. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  248. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  249. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD =======
  250. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  251. 25 >>>>>>> 730a8ca (Add login registration pages) =======
  252. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  253. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
  254. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 0d6dd12 (Manifest_cache true) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> e3e66f3 (Featire specs)
  255. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  256. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  257. =======
  258. >>>>>>> 752f0c0 (Featire specs) =======
  259. >>>>>>> 4e81ea2 (Featire specs) =======
  260. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  261. >>>>>>> 0d6dd12 (Manifest_cache true) =======
  262. >>>>>>> e3e66f3 (Featire specs)
  263. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
  264. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  265. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  266. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  267. 24 <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) =======
  268. 25 <<<<<<< HEAD =======
  269. 25 >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  270. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  271. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  272. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  273. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  274. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
  275. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  276. 25 >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  277. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  278. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  279. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
  280. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) =======
  281. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= =======
  282. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  283. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  284. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= =======
  285. 25 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= ======= =======
  286. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= =======
  287. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) respond_to do |format|
  288. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  289. =======
  290. >>>>>>> 752f0c0 (Featire specs) =======
  291. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  292. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  293. 24 >>>>>>> 08edf50 (Featire specs) =======
  294. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  295. 25 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages)
  296. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  297. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
  298. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  299. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs)
  300. 24 <<<<<<< HEAD ======= =======
  301. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  302. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  303. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  304. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  305. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
  306. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  307. 25 =======
  308. 25 >>>>>>> 9620751 (Featire specs) =======
  309. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
  310. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  311. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
  312. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  313. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  314. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  315. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  316. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  317. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  318. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  319. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) ======= ======= =======
  320. 25 <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
  321. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= =======
  322. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= =======
  323. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  324. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  325. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= =======
  326. 25 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) format.html
  327. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  328. =======
  329. >>>>>>> 752f0c0 (Featire specs) =======
  330. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  331. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  332. 24 >>>>>>> 08edf50 (Featire specs) =======
  333. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  334. 25 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages)
  335. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  336. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
  337. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  338. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs)
  339. 24 <<<<<<< HEAD ======= =======
  340. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  341. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  342. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  343. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  344. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
  345. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  346. 25 =======
  347. 25 >>>>>>> 9620751 (Featire specs) =======
  348. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
  349. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  350. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
  351. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  352. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  353. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  354. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  355. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  356. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  357. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  358. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) ======= ======= =======
  359. 25 <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
  360. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= =======
  361. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= =======
  362. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  363. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  364. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= =======
  365. 25 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) format.json do
  366. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  367. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  368. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  369. =======
  370. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  371. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  372. =======
  373. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  374. >>>>>>> 94841b5 (Featire specs) =======
  375. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  376. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  377. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  378. >>>>>>> e54deeb (Featire specs) =======
  379. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  380. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  381. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  382. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  383. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  384. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  385. =======
  386. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  387. >>>>>>> 9c0d812 (Featire specs) =======
  388. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  389. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  390. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  391. =======
  392. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  393. >>>>>>> 9c0d812 (Featire specs) =======
  394. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  395. >>>>>>> 3723aad (Featire specs) ======= =======
  396. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  397. =======
  398. >>>>>>> 752f0c0 (Featire specs) =======
  399. >>>>>>> 4e81ea2 (Featire specs) =======
  400. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  401. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  402. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  403. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  404. =======
  405. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
  406. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  407. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  408. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  409. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  410. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  411. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  412. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  413. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  414. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  415. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  416. =======
  417. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  418. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  419. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  420. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  421. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  422. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  423. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  424. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  425. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  426. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= =======
  427. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  428. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  429. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  430. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 1 render json: {
  431. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  432. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  433. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  434. =======
  435. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  436. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  437. =======
  438. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  439. >>>>>>> 94841b5 (Featire specs) =======
  440. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  441. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  442. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  443. >>>>>>> e54deeb (Featire specs) =======
  444. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  445. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  446. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  447. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  448. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  449. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  450. =======
  451. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  452. >>>>>>> 9c0d812 (Featire specs) =======
  453. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  454. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  455. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  456. =======
  457. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  458. >>>>>>> 9c0d812 (Featire specs) =======
  459. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  460. >>>>>>> 3723aad (Featire specs) ======= =======
  461. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  462. =======
  463. >>>>>>> 752f0c0 (Featire specs) =======
  464. >>>>>>> 4e81ea2 (Featire specs) =======
  465. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  466. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  467. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  468. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  469. =======
  470. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
  471. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  472. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  473. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  474. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  475. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  476. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  477. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  478. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  479. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  480. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  481. =======
  482. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  483. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  484. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  485. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  486. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  487. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  488. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  489. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  490. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  491. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= =======
  492. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  493. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  494. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  495. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) entries: render_to_string(partial: 'books/index/books', formats: [:html]),
  496. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  497. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  498. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  499. =======
  500. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  501. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  502. =======
  503. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  504. >>>>>>> 94841b5 (Featire specs) =======
  505. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  506. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  507. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  508. >>>>>>> e54deeb (Featire specs) =======
  509. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  510. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  511. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  512. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  513. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  514. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  515. =======
  516. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  517. >>>>>>> 9c0d812 (Featire specs) =======
  518. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  519. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  520. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  521. =======
  522. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  523. >>>>>>> 9c0d812 (Featire specs) =======
  524. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  525. >>>>>>> 3723aad (Featire specs) ======= =======
  526. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  527. =======
  528. >>>>>>> 752f0c0 (Featire specs) =======
  529. >>>>>>> 4e81ea2 (Featire specs) =======
  530. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  531. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  532. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  533. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  534. =======
  535. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
  536. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  537. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  538. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  539. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  540. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  541. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  542. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  543. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  544. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  545. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  546. =======
  547. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  548. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  549. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  550. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  551. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  552. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  553. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  554. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  555. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  556. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= =======
  557. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  558. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  559. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  560. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) pagination: view_context.will_paginate(@books)
  561. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  562. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  563. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  564. =======
  565. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  566. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  567. =======
  568. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  569. >>>>>>> 94841b5 (Featire specs) =======
  570. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  571. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  572. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  573. >>>>>>> e54deeb (Featire specs) =======
  574. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  575. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  576. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  577. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  578. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  579. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  580. =======
  581. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  582. >>>>>>> 9c0d812 (Featire specs) =======
  583. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  584. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  585. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  586. =======
  587. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  588. >>>>>>> 9c0d812 (Featire specs) =======
  589. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  590. >>>>>>> 3723aad (Featire specs) ======= =======
  591. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  592. =======
  593. >>>>>>> 752f0c0 (Featire specs) =======
  594. >>>>>>> 4e81ea2 (Featire specs) =======
  595. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  596. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  597. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  598. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  599. =======
  600. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
  601. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  602. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  603. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  604. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  605. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  606. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  607. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  608. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  609. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  610. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  611. =======
  612. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  613. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  614. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  615. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  616. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  617. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  618. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  619. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  620. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  621. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= =======
  622. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  623. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  624. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  625. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) }
  626. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  627. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  628. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  629. =======
  630. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  631. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  632. =======
  633. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  634. >>>>>>> 94841b5 (Featire specs) =======
  635. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  636. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  637. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  638. >>>>>>> e54deeb (Featire specs) =======
  639. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  640. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  641. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  642. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  643. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  644. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  645. =======
  646. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  647. >>>>>>> 9c0d812 (Featire specs) =======
  648. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  649. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  650. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  651. =======
  652. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  653. >>>>>>> 9c0d812 (Featire specs) =======
  654. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  655. >>>>>>> 3723aad (Featire specs) ======= =======
  656. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  657. =======
  658. >>>>>>> 752f0c0 (Featire specs) =======
  659. >>>>>>> 4e81ea2 (Featire specs) =======
  660. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  661. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  662. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  663. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  664. =======
  665. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
  666. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  667. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  668. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  669. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  670. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  671. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  672. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  673. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  674. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  675. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  676. =======
  677. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  678. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  679. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  680. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  681. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  682. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  683. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  684. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  685. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  686. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= =======
  687. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  688. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  689. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  690. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
  691. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  692. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  693. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  694. =======
  695. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  696. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  697. =======
  698. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  699. >>>>>>> 94841b5 (Featire specs) =======
  700. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  701. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  702. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  703. >>>>>>> e54deeb (Featire specs) =======
  704. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  705. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  706. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  707. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  708. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  709. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  710. =======
  711. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  712. >>>>>>> 9c0d812 (Featire specs) =======
  713. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  714. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  715. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  716. =======
  717. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  718. >>>>>>> 9c0d812 (Featire specs) =======
  719. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  720. >>>>>>> 3723aad (Featire specs) ======= =======
  721. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  722. =======
  723. >>>>>>> 752f0c0 (Featire specs) =======
  724. >>>>>>> 4e81ea2 (Featire specs) =======
  725. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  726. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  727. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  728. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  729. =======
  730. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
  731. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  732. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  733. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  734. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  735. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  736. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  737. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  738. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  739. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  740. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  741. =======
  742. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  743. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  744. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  745. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  746. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  747. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  748. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  749. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  750. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  751. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= =======
  752. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  753. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  754. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  755. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
  756. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  757. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  758. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  759. =======
  760. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  761. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  762. =======
  763. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  764. >>>>>>> 94841b5 (Featire specs) =======
  765. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  766. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  767. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  768. >>>>>>> e54deeb (Featire specs) =======
  769. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  770. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  771. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  772. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  773. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  774. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  775. =======
  776. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  777. >>>>>>> 9c0d812 (Featire specs) =======
  778. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  779. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  780. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  781. =======
  782. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  783. >>>>>>> 9c0d812 (Featire specs) =======
  784. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  785. >>>>>>> 3723aad (Featire specs) ======= =======
  786. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  787. =======
  788. >>>>>>> 752f0c0 (Featire specs) =======
  789. >>>>>>> 4e81ea2 (Featire specs) =======
  790. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  791. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  792. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  793. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  794. =======
  795. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
  796. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  797. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  798. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  799. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  800. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  801. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  802. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  803. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  804. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  805. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  806. =======
  807. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  808. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  809. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  810. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  811. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  812. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  813. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  814. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  815. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  816. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= =======
  817. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  818. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  819. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  820. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
  821. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  822. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  823. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  824. =======
  825. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  826. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  827. =======
  828. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  829. >>>>>>> 94841b5 (Featire specs) =======
  830. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  831. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  832. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  833. >>>>>>> e54deeb (Featire specs) =======
  834. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  835. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  836. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  837. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  838. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  839. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  840. =======
  841. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  842. >>>>>>> 9c0d812 (Featire specs) =======
  843. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  844. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  845. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  846. =======
  847. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  848. >>>>>>> 9c0d812 (Featire specs) =======
  849. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  850. >>>>>>> 3723aad (Featire specs) ======= =======
  851. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  852. =======
  853. >>>>>>> 752f0c0 (Featire specs) =======
  854. >>>>>>> 4e81ea2 (Featire specs) =======
  855. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  856. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  857. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  858. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  859. =======
  860. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
  861. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  862. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  863. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  864. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  865. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  866. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  867. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  868. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  869. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  870. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  871. =======
  872. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  873. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  874. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  875. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  876. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  877. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  878. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  879. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  880. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  881. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= =======
  882. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  883. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  884. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  885. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  886. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  887. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  888. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  889. =======
  890. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  891. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  892. =======
  893. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  894. >>>>>>> 94841b5 (Featire specs) =======
  895. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  896. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  897. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  898. >>>>>>> e54deeb (Featire specs) =======
  899. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  900. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  901. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  902. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  903. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  904. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  905. =======
  906. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  907. >>>>>>> 9c0d812 (Featire specs) =======
  908. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  909. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  910. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  911. =======
  912. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  913. >>>>>>> 9c0d812 (Featire specs) =======
  914. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  915. >>>>>>> 3723aad (Featire specs) ======= =======
  916. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  917. =======
  918. >>>>>>> 752f0c0 (Featire specs) =======
  919. >>>>>>> 4e81ea2 (Featire specs) =======
  920. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  921. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  922. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  923. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  924. =======
  925. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
  926. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  927. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  928. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  929. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  930. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  931. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  932. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  933. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  934. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  935. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  936. =======
  937. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  938. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  939. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  940. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  941. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  942. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  943. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  944. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  945. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  946. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= =======
  947. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  948. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  949. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  950. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 1 def show
  951. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  952. 11 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  953. 11 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) =======
  954. 11 ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs)
  955. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  956. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  957. =======
  958. >>>>>>> 752f0c0 (Featire specs) =======
  959. >>>>>>> 4e81ea2 (Featire specs) =======
  960. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
  961. 11 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
  962. 11 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  963. 11 =======
  964. 11 >>>>>>> 9620751 (Featire specs) =======
  965. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
  966. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  967. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) =======
  968. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
  969. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  970. =======
  971. >>>>>>> 752f0c0 (Featire specs) =======
  972. >>>>>>> 4e81ea2 (Featire specs) =======
  973. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
  974. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  975. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  976. 7 >>>>>>> 7a02bbe (Featire specs) =======
  977. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  978. 7 >>>>>>> 4552227 (Featire specs) =======
  979. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) =======
  980. 15 >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= =======
  981. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  982. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  983. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  984. 11 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD book = Book.find(params[:id]) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  985. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  986. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= =======
  987. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
  988. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  989. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  990. 11 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD book = Book.find_by(id: params[:id]) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD book = Book.find_by(id: params[:id]) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= @book = Book.find(params[:id]).decorate ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD book = Book.find_by(id: params[:id]) ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) @book = Book.find(params[:id]).decorate ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) book = Book.find_by(id: params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) book = Book.find(params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= book = Book.find_by(id: params[:id]) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  991. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  992. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  993. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  994. =======
  995. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  996. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  997. =======
  998. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  999. >>>>>>> 94841b5 (Featire specs) =======
  1000. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1001. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1002. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1003. >>>>>>> e54deeb (Featire specs) =======
  1004. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1005. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  1006. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1007. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1008. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1009. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1010. =======
  1011. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1012. >>>>>>> 9c0d812 (Featire specs) =======
  1013. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1014. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  1015. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  1016. =======
  1017. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1018. >>>>>>> 9c0d812 (Featire specs) =======
  1019. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1020. >>>>>>> 3723aad (Featire specs) ======= =======
  1021. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  1022. =======
  1023. >>>>>>> 752f0c0 (Featire specs) =======
  1024. >>>>>>> 4e81ea2 (Featire specs) =======
  1025. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  1026. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  1027. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1028. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  1029. =======
  1030. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
  1031. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1032. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1033. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1034. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1035. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1036. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1037. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1038. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  1039. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1040. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1041. =======
  1042. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1043. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1044. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1045. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1046. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1047. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1048. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1049. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1050. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  1051. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= =======
  1052. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1053. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  1054. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  1055. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  1056. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1057. 11 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1058. 11 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) =======
  1059. 11 ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs)
  1060. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  1061. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1062. =======
  1063. >>>>>>> 752f0c0 (Featire specs) =======
  1064. >>>>>>> 4e81ea2 (Featire specs) =======
  1065. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
  1066. 11 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
  1067. 11 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  1068. 11 =======
  1069. 11 >>>>>>> 9620751 (Featire specs) =======
  1070. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
  1071. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  1072. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1073. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
  1074. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1075. =======
  1076. >>>>>>> 752f0c0 (Featire specs) =======
  1077. >>>>>>> 4e81ea2 (Featire specs) =======
  1078. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
  1079. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1080. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1081. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  1082. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1083. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
  1084. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1085. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1086. 7 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
  1087. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= ======= =======
  1088. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
  1089. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) ======= ======= =======
  1090. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= =======
  1091. 11 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1092. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1093. 15 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  1094. 11 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if book.nil? ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) if book.nil? ======= redirect_to books_path if @book.nil? >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= if book.nil? >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= if book.nil? >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= if book.nil? >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  1095. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs)
  1096. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1097. =======
  1098. >>>>>>> 752f0c0 (Featire specs) =======
  1099. >>>>>>> 4e81ea2 (Featire specs) =======
  1100. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  1101. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs)
  1102. redirect_to books_path
  1103. else
  1104. 11 @book = book.decorate
  1105. end
  1106. <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs)
  1107. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs)
  1108. =======
  1109. >>>>>>> 752f0c0 (Featire specs) =======
  1110. >>>>>>> 4e81ea2 (Featire specs) =======
  1111. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  1112. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix)
  1113. redirect_to books_path
  1114. else
  1115. 11 <<<<<<< HEAD ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
  1116. 11 >>>>>>> a5d032d (Fix) @book = book.decorate ======= ======= >>>>>>> c4adab0 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= if book.nil? >>>>>>> c7a726c5 (Rebased)
  1117. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1118. =======
  1119. >>>>>>> a5d032d (Fix) end
  1120. <<<<<<< HEAD
  1121. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  1122. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1123. =======
  1124. >>>>>>> 752f0c0 (Featire specs) =======
  1125. >>>>>>> 4e81ea2 (Featire specs) =======
  1126. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1127. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix)
  1128. redirect_to books_path
  1129. else
  1130. <<<<<<< HEAD
  1131. 15 =======
  1132. 11 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
  1133. <<<<<<< HEAD
  1134. 15 =======
  1135. 11 >>>>>>> 31d15e66 (Fix) >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 31d15e66 (Fix) @book = book.decorate
  1136. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix)
  1137. =======
  1138. >>>>>>> a5d032d (Fix) <<<<<<< HEAD =======
  1139. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 31d15e66 (Fix) end
  1140. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix)
  1141. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) =======
  1142. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
  1143. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1144. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1145. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1146. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1147. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1148. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1149. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  1150. <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1151. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1152. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1153. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1154. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1155. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1156. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1157. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1158. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1159. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1160. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1161. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  1162. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
  1163. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= =======
  1164. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1165. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  1166. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  1167. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
  1168. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1169. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1170. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  1171. ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1172. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1173. =======
  1174. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1175. >>>>>>> 94841b5 (Featire specs) =======
  1176. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1177. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1178. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1179. >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  1180. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1181. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  1182. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1183. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1184. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1185. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1186. =======
  1187. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1188. >>>>>>> 9c0d812 (Featire specs) =======
  1189. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1190. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  1191. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  1192. =======
  1193. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1194. >>>>>>> 9c0d812 (Featire specs) =======
  1195. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1196. >>>>>>> 3723aad (Featire specs) ======= =======
  1197. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  1198. =======
  1199. >>>>>>> 752f0c0 (Featire specs) =======
  1200. >>>>>>> 4e81ea2 (Featire specs) =======
  1201. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  1202. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  1203. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1204. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1205. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  1206. =======
  1207. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
  1208. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1209. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1210. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1211. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1212. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1213. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1214. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1215. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  1216. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1217. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  1218. =======
  1219. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1220. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1221. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1222. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1223. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1224. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1225. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1226. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1227. end

app/controllers/coupons_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 class CouponsController < ApplicationController
  3. 1 def find
  4. 4 coupon = Coupon.find_by(code: params[:code])
  5. 4 order = Order.find(session[:order_id])
  6. 4 respond_to do |format|
  7. 4 format.json do
  8. 4 render json: CouponService.find_coupon(params, order, coupon)
  9. end
  10. end
  11. end
  12. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  13. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= =======
  14. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  15. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  16. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  17. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end

app/controllers/home_controller.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 class HomeController < ApplicationController
  2. 1 def index
  3. <<<<<<< HEAD <<<<<<< HEAD
  4. 13 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  5. 13 =======
  6. 3 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
  7. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  8. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) =======
  9. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
  10. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
  11. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= =======
  12. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
  13. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= ======= ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) =======
  14. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  15. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  16. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  17. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= =======
  18. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= =======
  19. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======
  20. 13 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
  21. 3 >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs)
  22. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  23. 13 >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  24. 13 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 3723aad (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  25. <<<<<<< HEAD <<<<<<< HEAD
  26. 13 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  27. 13 =======
  28. 3 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
  29. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  30. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) =======
  31. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
  32. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
  33. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
  34. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) =======
  35. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  36. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  37. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  38. 13 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  39. 13 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) @best_sellers = best_sellers
  40. end
  41. 1 private
  42. 1 def best_sellers
  43. <<<<<<< HEAD <<<<<<< HEAD
  44. 13 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  45. 13 =======
  46. 3 <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
  47. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
  48. 3 >>>>>>> 4e81ea2 (Featire specs) =======
  49. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
  50. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
  51. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= =======
  52. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
  53. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= ======= ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) =======
  54. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  55. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  56. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  57. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= =======
  58. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= =======
  59. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======
  60. 13 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) BookDecorator.decorate_collection(Book.first(4)) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
  61. 3 >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs)
  62. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  63. 13 >>>>>>> a5d032d (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  64. 13 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 3723aad (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= Book.first(4) >>>>>>> 752f0c0 (Featire specs) ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) ======= Book.first(4) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= Book.first(4) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= Book.first(4) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.first(4) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Book.first(4) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
  65. end
  66. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======

app/controllers/order_books_controller.rb

80.65% lines covered

31 relevant lines. 25 lines covered and 6 lines missed.
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 require_relative '../services/book_service'
  3. 1 class OrderBooksController < ApplicationController
  4. 1 before_action :update_order_last_action
  5. 1 def add_to_order
  6. 4 product = OrderBook.new(order_id: params[:order_id], book_id: params[:book_id], quantity: params[:quantity])
  7. 4 respond_to do |format|
  8. 4 format.html
  9. 4 format.json do
  10. 4 if product.save
  11. 4 render json: { notice: 'Added!' }
  12. else
  13. render json: { notice: 'Error!' }
  14. end
  15. end
  16. end
  17. end
  18. 1 def delete_product
  19. product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
  20. if product.destroy
  21. redirect_to orders_path, notice: I18n.t('order.messages.delete')
  22. else
  23. redirect_to orders_path, alert: I18n.t('order.errors.error_delete')
  24. end
  25. end
  26. 1 def update_quantity
  27. 2 product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
  28. 2 book = Book.find(params[:book_id])
  29. 2 order = Order.find(params[:order_id])
  30. 2 coupon = Coupon.find_by(code: params[:code])
  31. 2 respond_to do |format|
  32. 2 format.html
  33. 2 format.json do
  34. 2 render json: BookService.quantity_update(params, product, order, book, coupon)
  35. end
  36. end
  37. end
  38. 1 private
  39. 1 def order_item_params
  40. params.permit(%i[book_id quantity order_id])
  41. end
  42. 1 def update_order_last_action
  43. 6 Order.find(session[:order_id]).update(last_action: DateTime.now)
  44. end
  45. end

app/controllers/orders_controller.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class OrdersController < ApplicationController
  2. 1 def index
  3. 7 @cart = Order.find(session[:order_id]).decorate
  4. end
  5. 1 def registration_without_password; end
  6. end
>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)

app/controllers/reviews_controller.rb

100.0% lines covered

<<<<<<< HEAD 10 relevant lines. 10 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 <<<<<<< HEAD if @review.save ======= return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save >>>>>>> c7a726c5 (Rebased)
  6. <<<<<<< HEAD
  7. =======
  8. >>>>>>> c7a726c5 (Rebased) 1 <<<<<<< HEAD redirect_to book_path(@review.book), notice: I18n.t('review.success') ======= redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ') >>>>>>> c7a726c5 (Rebased)
  9. <<<<<<< HEAD
  10. =======
  11. >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD else
  12. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ') ======= end >>>>>>> c7a726c5 (Rebased)
  13. <<<<<<< HEAD end ======= >>>>>>> c7a726c5 (Rebased)
  14. <<<<<<< HEAD
  15. =======
  16. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD end ======= private >>>>>>> c7a726c5 (Rebased)
  17. 1 <<<<<<< HEAD private
  18. 1 ======= >>>>>>> c7a726c5 (Rebased) def review_params
  19. <<<<<<< HEAD
  20. =======
  21. >>>>>>> c7a726c5 (Rebased) 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  22. <<<<<<< HEAD
  23. =======
  24. >>>>>>> c7a726c5 (Rebased) end
  25. <<<<<<< HEAD
  26. =======
  27. >>>>>>> c7a726c5 (Rebased) end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)

app/decorators/author_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs)

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9d98d9ab (Featire specs)

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
  6. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  7. end
  8. 1 private
  9. 1 def review_params
  10. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  11. end
  12. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======

app/controllers/reviews_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 if @review.save
  6. 1 redirect_to book_path(@review.book), notice: I18n.t('review.success')
  7. else
  8. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  9. end
  10. end
  11. 1 private
  12. 1 def review_params
  13. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  14. end
  15. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
>>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)

app/decorators/author_decorator.rb

<<<<<<< HEAD ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
  6. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  7. end
  8. 1 private
  9. 1 def review_params
  10. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  11. end
  12. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 02a399d (Manifest_cache true) =======
>>>>>>> bd8bda4 (Manifest_cache true) =======
>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased)
>>>>>>> 11792758 (Rebased)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= =======

app/decorators/author_decorator.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======

app/helpers/application_helper.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======

app/decorators/author_decorator.rb

>>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) class AuthorDecorator < Draper::Decorator <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD class AuthorDecorator < Draper::Decorator ======= module ApplicationHelper >>>>>>> 752f0c0 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> bd8bda4 (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) class AuthorDecorator < Draper::Decorator <<<<<<< HEAD ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= module ApplicationHelper >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= module ApplicationHelper >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= class AuthorDecorator < Draper::Decorator >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) delegate_all
  3. 1 def full_name
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
  5. 3 <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  6. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs)
  7. ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  8. 3 <<<<<<< HEAD =======
  9. 2 >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  10. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
  11. 2 >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) =======
  12. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs)
  13. 2 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
  14. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
  15. 3 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  16. 2 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  17. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  18. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
  19. 3 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  20. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= =======
  21. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= =======
  22. 3 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) "#{first_name} #{last_name}"
  23. end
  24. end

app/decorators/book_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 100.0% <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 90.0% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 100.0% ======= 90.0% >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 90.0% >>>>>>> bd8bda4 (Manifest_cache true) ======= 90.0% >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) 90.0% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) 100.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.0% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 66.67% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 100.0% >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= 66.67% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 100.0% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) lines covered

<<<<<<< HEAD 12 relevant lines. 12 lines covered and 0 lines missed. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 12 relevant lines. 12 lines covered and 0 lines missed. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 10 relevant lines. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 9 lines covered and 1 lines missed. ======= <<<<<<< HEAD 10 lines covered and 0 lines missed. ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 9 lines covered and 1 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> aa7b40c (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) ======= 10 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= 12 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= 12 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 31d15e66 (Fix) 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    
  1. 1 require 'monetize'
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs)
  3. =======
  4. 1 <<<<<<< HEAD ======= ======= ======= >>>>>>> ebcdce06 (Featire specs)
  5. =======
  6. 1 decorates_association :authors <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  7. 1 <<<<<<< HEAD decorates_association :categories ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :categories ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) ======= decorates_association :categories >>>>>>> bd8bda4 (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) ======= decorates_association :categories >>>>>>> aa7b40c (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  8. >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 450f4e3 (Manifest_cache true)
  9. =======
  10. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= =======
  11. 1 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 450f4e3 (Manifest_cache true) =======
  12. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) =======
  13. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= =======
  14. >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= =======
  15. >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 13fca83d (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) decorates_association :authors <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  16. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) decorates_association :categories ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :categories ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) ======= decorates_association :categories >>>>>>> bd8bda4 (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) ======= decorates_association :categories >>>>>>> aa7b40c (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) class BookDecorator < Draper::Decorator ======= decorates_association :categories >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= class BookDecorator < Draper::Decorator >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 94841b5 (Featire specs) class BookDecorator < Draper::Decorator ======= PAGINATION_PER_PAGE = 12 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= class BookDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 11792758 (Rebased)
  17. <<<<<<< HEAD
  18. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  19. >>>>>>> 9bfbd88 (Featire specs) =======
  20. 1 decorates_association :authors
  21. >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 5b7749a (Fix)
  22. 1 decorates_association :authors
  23. <<<<<<< HEAD =======
  24. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
  25. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix)
  26. 1 class BookDecorator < Draper::Decorator ======= class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) class BookDecorator < Draper::Decorator ======= decorates_association :categories >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= class BookDecorator < Draper::Decorator >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs)
  27. 1 decorates_association :authors
  28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 84003439 (Featire specs)
  29. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) def self.collection_decorator_class
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
  31. ======= <<<<<<< HEAD
  32. 30 =======
  33. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) =======
  34. >>>>>>> bd8bda4 (Manifest_cache true) =======
  35. >>>>>>> aa7b40c (Manifest_cache true) =======
  36. 31 >>>>>>> 1214e1f (Add login registration pages) =======
  37. >>>>>>> 183b6c5 (Manifest_cache true) =======
  38. 30 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) =======
  39. 56 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  40. 31 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
  41. 56 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 11792758 (Rebased) =======
  42. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  43. 58 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= =======
  44. 58 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) PaginatingDecorator
  45. end
  46. 1 delegate_all
  47. 1 def authors_names
  48. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  49. 1 ======= <<<<<<< HEAD
  50. 89 =======
  51. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  52. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
  53. 1 >>>>>>> aa7b40c (Manifest_cache true) =======
  54. 90 >>>>>>> 1214e1f (Add login registration pages) =======
  55. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
  56. 89 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
  57. 101 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  58. 90 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  59. 101 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 11792758 (Rebased) =======
  60. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  61. 105 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
  62. 109 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= =======
  63. 105 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) authors.map(&:full_name).join(', ')
  64. end
  65. 1 def categories_names
  66. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  67. 12 =======
  68. 8 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
  69. 8 =======
  70. 12 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  71. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  72. 12 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  73. 12 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  74. 12 >>>>>>> e3e66f3 (Featire specs) =======
  75. >>>>>>> 11792758 (Rebased) =======
  76. 12 >>>>>>> 31d15e66 (Fix) categories.pluck(:name).join(', ')
  77. end <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  78. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs)
  79. 1 def price <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
  80. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs)
  81. 121 =======
  82. >>>>>>> 11792758 (Rebased) Money.new(price_cents)
  83. <<<<<<< HEAD =======
  84. >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) end
  85. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  86. 1 def price >>>>>>> 84809242 (Featire specs)
  87. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  88. 125 ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD
  89. 121 =======
  90. 125 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  91. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  92. 125 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  93. 125 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  94. 125 >>>>>>> e3e66f3 (Featire specs) =======
  95. 144 >>>>>>> 5b7749a (Fix) =======
  96. 143 >>>>>>> 366b257 (Fix) =======
  97. 125 >>>>>>> 31d15e66 (Fix) Money.new(price_cents)
  98. end
  99. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======

app/decorators/order_book_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 require 'monetize'
  2. 1 class OrderBookDecorator < Draper::Decorator
  3. 1 delegate_all
  4. 1 def total_price
  5. 8 Money.new(book.price_cents * quantity)
  6. end
  7. end

app/decorators/order_decorator.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 require 'monetize'
  2. 1 class OrderDecorator < Draper::Decorator
  3. 1 delegate_all
  4. 1 def order_price(coupon = 0)
  5. 27 total_price = 0
  6. 27 order_books.each do |order_book|
  7. 25 total_price += order_book.book.price_cents * order_book.quantity
  8. end
  9. 27 Money.new(total_price - (total_price * coupon))
  10. end
  11. end
>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  2. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  3. ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  5. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  7. >>>>>>> bd8bda4 (Manifest_cache true) =======
  8. >>>>>>> aa7b40c (Manifest_cache true) =======
  9. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) end
  10. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs)

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  1. 1 class ReviewDecorator < Draper::Decorator
  2. 1 delegate_all
  3. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs)
  4. 1 def date_time
  5. 1 created_at.strftime('%m/%d/%Y')
  6. end
  7. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. <<<<<<< HEAD ======= ======= ======= >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  9. 1 def date_time
  10. 1 created_at.strftime('%m/%d/%Y')
  11. end
  12. end
  13. >>>>>>> 84809242 (Featire specs)
<<<<<<< HEAD =======

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a5d032d (Fix)

app/decorators/paginating_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 100.0% <<<<<<< HEAD ======= ======= 100.0% >>>>>>> 872e675 (Fix) ======= 100.0% >>>>>>> 0d6dd12 (Manifest_cache true) ======= 100.0% >>>>>>> e3e66f3 (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= 2 relevant lines. 2 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= 2 relevant lines. 2 lines covered and >>>>>>> e3e66f3 (Featire specs) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD class PaginatingDecorator < Draper::CollectionDecorator ======= module ApplicationHelper <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> c8da2e3 (Fix) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> 0d6dd12 (Manifest_cache true) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> e3e66f3 (Featire specs)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> 872e675 (Fix) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> 0d6dd12 (Manifest_cache true) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> e3e66f3 (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  4. end

app/decorators/review_decorator.rb

100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= 75.0% >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

4 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 3 lines covered and <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= 4 lines covered and >>>>>>> 872e675 (Fix) ======= 4 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= 4 lines covered and >>>>>>> e3e66f3 (Featire specs) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD class ReviewDecorator < Draper::Decorator >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= class ReviewDecorator < Draper::Decorator >>>>>>> 872e675 (Fix) ======= class ReviewDecorator < Draper::Decorator >>>>>>> 0d6dd12 (Manifest_cache true) ======= class ReviewDecorator < Draper::Decorator >>>>>>> e3e66f3 (Featire specs)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= ======= delegate_all ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD delegate_all >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= delegate_all >>>>>>> 872e675 (Fix) ======= delegate_all >>>>>>> 0d6dd12 (Manifest_cache true) ======= delegate_all >>>>>>> e3e66f3 (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def full_name ======= def date_time >>>>>>> b28889f (Fix) ======= def date_time >>>>>>> 872e675 (Fix) ======= def date_time >>>>>>> 0d6dd12 (Manifest_cache true) ======= def date_time >>>>>>> e3e66f3 (Featire specs)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  6. 2 =======
  7. 1 >>>>>>> b28889f (Fix) =======
  8. 1 >>>>>>> 872e675 (Fix) =======
  9. 1 >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  10. 1 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD "#{first_name} #{last_name}" ======= ======= >>>>>>> 5b7749a (Fix) created_at.strftime('%m/%d/%Y') >>>>>>> b28889f (Fix) ======= created_at.strftime('%m/%d/%Y') >>>>>>> 872e675 (Fix) ======= created_at.strftime('%m/%d/%Y') >>>>>>> 0d6dd12 (Manifest_cache true) ======= created_at.strftime('%m/%d/%Y') >>>>>>> e3e66f3 (Featire specs)
  11. end
  12. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

app/decorators/book_decorator.rb

90.0% ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)

app/decorators/user_decorator.rb

100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= >>>>>>> 49e8a6c (Rebased) 1 lines missed. ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased)
=======
>>>>>>> a5d032d (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator
  2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  3. end

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. <<<<<<< HEAD <<<<<<< HEAD 4 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    
  1. 1 require 'image_processing'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :authors >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs)
  3. end

app/decorators/review_decorator.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) 0 lines missed.
    
  1. 1 module ApplicationHelper <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
  2. 1 <<<<<<< HEAD def markdown(text) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) ======= delegate_all ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
  3. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 1 def full_name
  5. 2 "#{first_name} #{last_name}"
  6. end
  7. end

app/decorators/book_decorator.rb

90.0% ======= 100.0% >>>>>>> c7a726c5 (Rebased) lines covered

<<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= 4 relevant lines. <<<<<<< HEAD 3 lines covered and >>>>>>> 75fa7e1b (Rebased) 1 lines missed. ======= ======= >>>>>>> 31d15e66 (Fix) 4 lines covered and 0 lines missed.
    
  1. 1 class ReviewDecorator < Draper::Decorator <<<<<<< HEAD ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) module ApplicationHelper >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= module ApplicationHelper >>>>>>> 0d6dd12 (Manifest_cache true) ======= module ApplicationHelper >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
  3. 1 ======= =======
  4. 12 =======
  5. 1 >>>>>>> 49e8a6c (Rebased) =======
  6. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  7. 1 >>>>>>> e3e66f3 (Featire specs) =======
  8. 1 >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Markdown.new(text).to_html ======= def markdown(text) >>>>>>> 49e8a6c (Rebased) ======= def markdown(text) >>>>>>> 0d6dd12 (Manifest_cache true) ======= def markdown(text) >>>>>>> e3e66f3 (Featire specs)
  9. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  10. =======
  11. 13 <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  12. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  13. 13 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  14. 13 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  15. 13 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) delegate_all
  16. 1 def date_time
  17. <<<<<<< HEAD <<<<<<< HEAD
  18. 1 =======
  19. 17 >>>>>>> 5b7749a (Fix) =======
  20. 1 >>>>>>> 31d15e66 (Fix) created_at.strftime('%m/%d/%Y') <<<<<<< HEAD ======= Markdown.new(text).to_html.html_safe >>>>>>> c8da2e3 (Fix) ======= Markdown.new(text).to_html.html_safe >>>>>>> 0d6dd12 (Manifest_cache true) ======= Markdown.new(text).to_html.html_safe >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix)
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) end
  22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
<<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 31d15e66 (Fix)

app/helpers/application_helper.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) 0 lines missed. >>>>>>> 67ab5299 (Fix)
    
  1. 1 <<<<<<< HEAD require 'image_processing'
  2. 1 ======= >>>>>>> 824bb2b (Featire specs) module ApplicationHelper
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs)
  4. 12 ======= ======= >>>>>>> 84809242 (Featire specs)
  5. =======
  6. >>>>>>> 824bb2b (Featire specs) 1 >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD <<<<<<< HEAD Markdown.new(text).to_html ======= def markdown(text) >>>>>>> 75fa7e1b (Rebased) ======= def markdown(text) ======= <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs)
  7. <<<<<<< HEAD
  8. 13 ======= <<<<<<< HEAD
  9. 12 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD Markdown.new(text).to_html.html_safe ======= Markdown.new(text).to_html >>>>>>> 824bb2b (Featire specs)
  10. <<<<<<< HEAD
  11. =======
  12. >>>>>>> 824bb2b (Featire specs) end
  13. <<<<<<< HEAD
  14. =======
  15. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) end

app/helpers/constants.rb

100.0% lines covered

21 relevant lines. 21 lines covered and 0 lines missed.
    
  1. 1 module Constants
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) =======
  3. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  4. >>>>>>> 752f0c0 (Featire specs) =======
  5. >>>>>>> 4e81ea2 (Featire specs) =======
  6. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
  7. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  8. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  9. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
  10. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  11. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
  12. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 1 PAGINATION_PER_PAGE = 12 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD ======= decorates_association :categories >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= decorates_association :categories >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= decorates_association :categories >>>>>>> 02a399d (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
  13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs)
  14. ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  15. =======
  16. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= =======
  17. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) =======
  18. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= =======
  19. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= =======
  20. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= =======
  21. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= =======
  22. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
  23. >>>>>>> 752f0c0 (Featire specs) =======
  24. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  25. >>>>>>> 5b7749a (Fix)
  26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  27. 1 STAR_MIN = 0
  28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  29. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) STAR_MAX = 5
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  31. =======
  32. =======
  33. 30 =======
  34. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
  35. 31 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) PaginatingDecorator
  36. end
  37. >>>>>>> 02a399d (Manifest_cache true) =======
  38. >>>>>>> 5b7749a (Fix)
  39. 1 CATALOG_BOOK_COUNT = 3
  40. 1 BEST_SELLER_COUNT = 4
  41. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= delegate_all
  42. 1 def authors_names
  43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  44. 1 ======= <<<<<<< HEAD
  45. 89 =======
  46. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
  47. 90 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) authors.map(&:full_name).join(', ')
  48. end
  49. 1 def categories_names
  50. 1 categories.map(&:name).join(', ')
  51. end
  52. end

app/decorators/category_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class CategoryDecorator < Draper::Decorator
  2. 1 delegate_all
  3. <<<<<<< HEAD ======= <<<<<<< HEAD end

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
  2. <<<<<<< HEAD
  3. ======= <<<<<<< HEAD
  4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  5. =======
  6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) end
  7. <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true)
  8. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper ======= >>>>>>> bd8bda4 (Manifest_cache true)
  2. 1 <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) DESCRIPTION_LENGTH = 25
  3. <<<<<<< HEAD
  4. 1 def full_name
  5. 2 "#{first_name} #{last_name}" <<<<<<< HEAD ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs)
  6. <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) end
  7. end

app/decorators/book_decorator.rb

90.0% lines covered

10 relevant lines. 9 lines covered and 1 lines missed. ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> c7a726c5 (Rebased)
    
  1. 1 require 'monetize'
  2. <<<<<<< HEAD
  3. 1 decorates_association :authors >>>>>>> bd8bda4 (Manifest_cache true)
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  5. 1 MIN_PRICE_IN_CENTS = 0
  6. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD MAX_PRICE_IN_CENTS = 50_000 ======= MAX_PRICE_IN_CENTS = 10_000 >>>>>>> 824bb2b (Featire specs) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> 311e9fa (Rebased) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> 0d6dd12 (Manifest_cache true) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> e3e66f3 (Featire specs)
  7. =======
  8. >>>>>>> c7a726c5 (Rebased)
  9. <<<<<<< HEAD
  10. =======
  11. >>>>>>> c7a726c5 (Rebased) 1 <<<<<<< HEAD TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
  12. 1 NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
  13. 1 COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
  14. 1 PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
  15. 1 ZIP_FORMAT = /\A[0-9]+\z/.freeze
  16. 1 VALIDATES_NAME_LENGTH_MAX = 50
  17. 1 VALIDATES_TEXT_LENGTH_MAX = 500
  18. 1 VALIDATES_TITLE_LENGTH_MAX = 80
  19. 1 VALIDATES_PHONE_LENGTH_MAX = 15
  20. 1 VALIDATES_ZIP_LENGTH_MAX = 10
  21. 1 FOOTER_NUMBER = '(555)-555-5555'.freeze
  22. 1 FOOTER_EMAIL = 'support@bookstore.com'.freeze
  23. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

app/interactors/billing_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed.
    
  1. 1 class BillingUpdate
  2. 1 include Interactor
  3. ======= class BookDecorator < Draper::Decorator >>>>>>> c7a726c5 (Rebased)
  4. 1 <<<<<<< HEAD def call ======= decorates_association :authors >>>>>>> c7a726c5 (Rebased)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  6. =======
  7. >>>>>>> c7a726c5 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) params = context.permitted_params ======= def self.collection_decorator_class >>>>>>> c7a726c5 (Rebased)
  8. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased)
  9. ======= <<<<<<< HEAD
  10. 30 =======
  11. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  12. 31 >>>>>>> 1214e1f (Add login registration pages) =======
  13. >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD
  14. >>>>>>> 0d6dd12 (Manifest_cache true) =======
  15. >>>>>>> e3e66f3 (Featire specs) =======
  16. 30 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  17. 56 >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) PaginatingDecorator
  18. end
  19. 1 delegate_all
  20. 1 def authors_names
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  22. 1 ======= <<<<<<< HEAD
  23. 89 =======
  24. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) =======
  25. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
  26. 1 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 84003439 (Featire specs) =======
  27. 90 >>>>>>> 1214e1f (Add login registration pages) =======
  28. 1 >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD
  29. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  30. 1 >>>>>>> e3e66f3 (Featire specs) =======
  31. 89 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) =======
  32. 101 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  33. 90 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  34. 101 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= =======
  35. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) ======= =======
  36. 105 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) authors.map(&:full_name).join(', ')
  37. end
  38. 1 def categories_names
  39. <<<<<<< HEAD
  40. 8 ======= <<<<<<< HEAD
  41. 12 =======
  42. 8 >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) categories.pluck(:name).join(', ')
  43. end <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
  44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs)
  45. 1 def price <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
  46. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs)
  47. 121 Money.new(price_cents)
  48. <<<<<<< HEAD =======
  49. >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) end
  50. <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) =======
  51. 1 def price
  52. 125 Money.new(price_cents)
  53. end
  54. >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs)
  2. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  3. ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs)
  4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  5. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs)
  6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  7. >>>>>>> bd8bda4 (Manifest_cache true) =======
  8. >>>>>>> aa7b40c (Manifest_cache true) =======
  9. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) end
  10. <<<<<<< HEAD <<<<<<< HEAD

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
  1. 1 class ReviewDecorator < Draper::Decorator
  2. 1 delegate_all
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 1 def date_time
  5. 1 created_at.strftime('%m/%d/%Y')
  6. end
  7. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. ======= ======= >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  9. 1 def date_time
  10. 1 created_at.strftime('%m/%d/%Y')
  11. end
  12. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4552227 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased)
<<<<<<< HEAD
  • <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs)
    >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD end
  • <<<<<<< HEAD <<<<<<< HEAD

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. =======
    2. >>>>>>> c7a726c5 (Rebased) 1 <<<<<<< HEAD class PaginatingDecorator < Draper::CollectionDecorator ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= def price >>>>>>> c7a726c5 (Rebased)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. ======= <<<<<<< HEAD
    5. 1 =======
    6. 121 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= Money.new(price_cents) >>>>>>> c7a726c5 (Rebased)
    7. <<<<<<< HEAD
    8. =======
    9. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    10. >>>>>>> d782a28 (Manifest_cache true) end
    11. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    12. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs)
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 02a399d (Manifest_cache true) ======= delegate_all
    3. 1 def full_name
    4. 2 =======
    5. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) "#{first_name} #{last_name}"
    6. =======
    7. >>>>>>> c7a726c5 (Rebased) end
    8. <<<<<<< HEAD
    9. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors ======= DESCRIPTION_LENGTH = 25 >>>>>>> d782a28 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 0d6dd12 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> e3e66f3 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4e81ea2 (Featire specs) ======= delegate_all
    3. 1 def full_name
    4. 3 "#{first_name} #{last_name}"
    5. end
    6. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> aa7b40c (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    4. 1 user = context.current_user
    5. 1 return if params[:billing].nil?
    6. 1 return if user.billing.update(params[:billing])
    7. context.fail!
    8. end
    9. end

    app/interactors/shipping_update.rb

    87.5% lines covered

    8 relevant lines. 7 lines covered and 1 lines missed.
        
    1. 1 class ShippingUpdate
    2. 1 include Interactor
    3. 1 def call
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) params = context.permitted_params
    6. <<<<<<< HEAD
    7. PaginatingDecorator
    8. end
    9. 1 delegate_all
    10. 1 def authors_names
    11. 1 authors.map(&:full_name).join(', ')
    12. end
    13. 1 def categories_names
    14. 1 categories.map(&:name).join(', ')
    15. end
    16. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end
    ======= >>>>>>> 824bb2b (Featire specs)

    app/helpers/application_helper.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> 183b6c5 (Manifest_cache true)
    2. 1 <<<<<<< HEAD DESCRIPTION_LENGTH = 25 >>>>>>> aa7b40c (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs) ======= delegate_all
    3. 1 def full_name
    4. 2 "#{first_name} #{last_name}" ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4552227 (Featire specs)
    5. <<<<<<< HEAD end
    6. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and ======= 3 lines covered and >>>>>>> 11792758 (Rebased) 1 lines missed. ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) 0 lines missed. >>>>>>> 31d15e66 (Fix)
        
    1. 1 <<<<<<< HEAD require 'image_processing'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) module ApplicationHelper >>>>>>> 11792758 (Rebased)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix)
    4. 1 user = context.current_user
    5. 1 return if params[:shipping].nil?
    6. <<<<<<< HEAD
    7. 31 PaginatingDecorator
    8. end
    9. 1 delegate_all
    10. 1 def authors_names
    11. 90 authors.map(&:full_name).join(', ')
    12. end
    13. 1 def categories_names
    14. 1 categories.map(&:name).join(', ')
    15. end
    16. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. =======
    4. >>>>>>> c7a726c5 (Rebased) end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD class PaginatingDecorator < Draper::CollectionDecorator ======= module ApplicationHelper <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs)
    2. 1 <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= ======= delegate_all ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs)
    3. <<<<<<< HEAD
    4. 1 def full_name
    5. 2 "#{first_name} #{last_name}"
    6. end
    7. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs)
    3. end
    <<<<<<< HEAD

    app/helpers/application_helper.rb

    =======

    app/decorators/review_decorator.rb

    >>>>>>> c7a726c5 (Rebased)

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
        
      <<<<<<< HEAD
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true)
    2. 1 <<<<<<< HEAD DESCRIPTION_LENGTH = 25 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= delegate_all
    3. =======
    4. 1 class ReviewDecorator < Draper::Decorator
    5. 1 delegate_all
    6. >>>>>>> c7a726c5 (Rebased)
    7. <<<<<<< HEAD
    8. =======
    9. >>>>>>> 824bb2b (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD def full_name
    10. 3 "#{first_name} #{last_name}"
    11. end
    12. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. 1 user = context.current_user
    5. 1 return if params[:shipping].nil?
    6. ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
    7. 1 return if user.shipping.update(params[:shipping])
    8. context.fail!
    9. end
    10. end

    app/interactors/user_update.rb

    100.0% lines covered

    13 relevant lines. 13 lines covered and 0 lines missed.
        
    1. 1 class UserUpdate
    2. 1 include Interactor
    3. 1 def call
    4. 5 params = context.permitted_params
    5. 5 user = context.current_user
    6. 5 billing_and_shipping_update(params, user)
    7. 5 return if params[:user].nil?
    8. 3 return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
    9. 2 return if !params[:user][:password].nil? &&
    10. user.reset_password(params[:user][:password], params[:user][:password_confirmation])
    11. 1 context.fail!
    12. end
    13. 1 def billing_and_shipping_update(params, user)
    14. 5 return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
    15. 4 !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
    16. end
    17. end

    app/jobs/application_job.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class ApplicationJob < ActiveJob::Base
    2. # Automatically retry jobs that encountered a deadlock
    3. # retry_on ActiveRecord::Deadlocked
    4. # Most jobs are safe to ignore if the underlying records are no longer available
    5. # discard_on ActiveJob::DeserializationError
    6. end

    app/jobs/cart_cleaner.rb

    60.0% lines covered

    5 relevant lines. 3 lines covered and 2 lines missed.
        
    1. 1 class CartCleaner < ApplicationJob
    2. # include Sidekiq::Job
    3. 1 queue_as :default
    4. 1 def perform(order_id)
    5. order = Order.find(order_id)
    6. order.destroy if order.status.eql?('initialized')
    7. end
    8. end

    app/models/address.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 class Address < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 validates :first_name, :last_name,
    4. length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX }, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true)
    2. <<<<<<< HEAD
    3. =======
    4. 1 <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
    5. 1 def full_name
    6. 2 "#{first_name} #{last_name}" ======= >>>>>>> 67ab5299 (Fix) ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= =======

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> aa7b40c (Manifest_cache true)
    2. 1 <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
    3. 1 def full_name
    4. 2 "#{first_name} #{last_name}" ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    5. <<<<<<< HEAD =======
    6. >>>>>>> bd8bda4 (Manifest_cache true) =======
    7. >>>>>>> 4e81ea2 (Featire specs) =======
    8. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
    9. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors
    3. 1 decorates_association :categories
    4. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
    5. ======= def date_time >>>>>>> c7a726c5 (Rebased)
    6. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD def self.collection_decorator_class ======= >>>>>>> e5752db (Featire specs) def self.collection_decorator_class <<<<<<< HEAD ======= ======= def self.collection_decorator_class ======= created_at.strftime('%m/%d/%Y') >>>>>>> c7a726c5 (Rebased)
    7. <<<<<<< HEAD
    8. 31 =======
    9. >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD PaginatingDecorator ======= end >>>>>>> c7a726c5 (Rebased)
    10. <<<<<<< HEAD end ======= end

    app/decorators/user_decorator.rb

    100.0% lines covered

    5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 class UserDecorator < Draper::Decorator
    2. 1 delegate_all
    3. 1 def name_or_email
    4. 2 return name if name.present?
    5. 2 email.split('@').first.capitalize >>>>>>> c7a726c5 (Rebased)
    6. <<<<<<< HEAD
    7. 1 delegate_all
    8. 1 def authors_names
    9. 90 authors.map(&:full_name).join(', ')
    10. ======= >>>>>>> c7a726c5 (Rebased) end
    11. <<<<<<< HEAD
    12. 1 def categories_names
    13. 1 categories.map(&:name).join(', ')
    14. end
    15. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. =======
    4. >>>>>>> c7a726c5 (Rebased) end

    app/helpers/application_helper.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 ======= >>>>>>> 84003439 (Featire specs) def markdown(text) ======= <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD
    4. 12 =======
    5. 1 >>>>>>> 11792758 (Rebased) <<<<<<< HEAD Markdown.new(text).to_html ======= def markdown(text) >>>>>>> 11792758 (Rebased)
    6. =======
    7. 13 >>>>>>> 31d15e66 (Fix) =======
    8. 13 ======= <<<<<<< HEAD
    9. 12 >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD Markdown.new(text).to_html.html_safe ======= Markdown.new(text).to_html >>>>>>> 824bb2b (Featire specs)
    10. <<<<<<< HEAD
    11. =======
    12. >>>>>>> 824bb2b (Featire specs) end
    13. <<<<<<< HEAD
    14. =======
    15. >>>>>>> 824bb2b (Featire specs) end

    app/helpers/constants.rb

    100.0% lines covered

    21 relevant lines. 21 lines covered and 0 lines missed.
        
    1. 1 module Constants
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= =======
    3. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    4. >>>>>>> 752f0c0 (Featire specs) =======
    5. >>>>>>> 4e81ea2 (Featire specs) =======
    6. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= =======
    7. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    8. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 1 PAGINATION_PER_PAGE = 12 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= decorates_association :categories >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased)
    9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    10. ======= <<<<<<< HEAD
    11. =======
    12. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= =======
    13. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs)
    14. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs)
    15. 1 STAR_MIN = 0
    16. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs)
    17. 1 <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) STAR_MAX = 5
    18. 1 CATALOG_BOOK_COUNT = 3
    19. 1 BEST_SELLER_COUNT = 4
    20. 1 <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) DESCRIPTION_LENGTH = 25
    21. <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs)
    22. 1 MIN_PRICE_IN_CENTS = 0
    23. 1 <<<<<<< HEAD MAX_PRICE_IN_CENTS = 50_000 ======= MAX_PRICE_IN_CENTS = 10_000 >>>>>>> 824bb2b (Featire specs)
    24. 1 TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
    25. 1 NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
    26. 1 COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
    27. 1 PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
    28. 1 ZIP_FORMAT = /\A[0-9]+\z/.freeze
    29. 1 VALIDATES_NAME_LENGTH_MAX = 50
    30. 1 VALIDATES_TEXT_LENGTH_MAX = 500
    31. 1 VALIDATES_TITLE_LENGTH_MAX = 80
    32. 1 VALIDATES_PHONE_LENGTH_MAX = 15
    33. 1 VALIDATES_ZIP_LENGTH_MAX = 10
    34. 1 FOOTER_NUMBER = '(555)-555-5555'.freeze
    35. 1 FOOTER_EMAIL = 'support@bookstore.com'.freeze
    36. end
    <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix)

    app/interactors/billing_update.rb

    87.5% lines covered

    8 relevant lines. 7 lines covered and 1 lines missed.
        
    1. 1 class BillingUpdate
    2. 1 include Interactor
    3. 1 def call
    4. ======= >>>>>>> 752f0c0 (Featire specs)
    5. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) params = context.permitted_params
    6. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD
    7. ======= <<<<<<< HEAD
    8. 30 =======
    9. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    10. 31 >>>>>>> 1214e1f (Add login registration pages) PaginatingDecorator
    11. end
    12. 1 delegate_all
    13. 1 def authors_names
    14. <<<<<<< HEAD <<<<<<< HEAD
    15. 1 ======= <<<<<<< HEAD
    16. 89 =======
    17. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    18. 90 >>>>>>> 1214e1f (Add login registration pages) authors.map(&:full_name).join(', ')
    19. end
    20. 1 def categories_names
    21. 1 categories.map(&:name).join(', ')
    22. end
    23. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. <<<<<<< HEAD ======= <<<<<<< HEAD end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
    2. <<<<<<< HEAD
    3. ======= <<<<<<< HEAD
    4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    5. =======
    6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) end
    7. <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true)
    8. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> bd8bda4 (Manifest_cache true)
    2. 1 <<<<<<< HEAD DESCRIPTION_LENGTH = 25 >>>>>>> 02a399d (Manifest_cache true) ======= delegate_all
    3. 1 def full_name
    4. 2 =======
    5. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) "#{first_name} #{last_name}"
    6. end
    7. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> bd8bda4 (Manifest_cache true)
    3. <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix)
    4. 1 user = context.current_user
    5. 1 return if params[:billing].nil?
    6. 1 return if user.billing.update(params[:billing])
    7. context.fail!
    8. end
    9. end

    app/interactors/shipping_update.rb

    87.5% lines covered

    8 relevant lines. 7 lines covered and 1 lines missed.
        
    1. 1 class ShippingUpdate
    2. 1 include Interactor
    3. 1 def call
    4. 1 params = context.permitted_params
    5. 1 user = context.current_user
    6. 1 return if params[:shipping].nil?
    7. 1 return if user.shipping.update(params[:shipping])
    8. context.fail!
    9. end
    10. end

    app/interactors/user_update.rb

    100.0% lines covered

    13 relevant lines. 13 lines covered and 0 lines missed.
        
    1. 1 class UserUpdate
    2. 1 include Interactor
    3. 1 def call
    4. 5 params = context.permitted_params
    5. 5 user = context.current_user
    6. 5 billing_and_shipping_update(params, user)
    7. 5 return if params[:user].nil?
    8. 3 return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
    9. 2 return if !params[:user][:password].nil? &&
    10. user.reset_password(params[:user][:password], params[:user][:password_confirmation])
    11. 1 context.fail!
    12. end
    13. 1 def billing_and_shipping_update(params, user)
    14. 5 return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
    15. 4 !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
    16. end
    17. end

    app/models/address.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 class Address < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 validates :first_name, :last_name,
    4. length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX }, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true)
    2. <<<<<<< HEAD
    3. =======
    4. 1 <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
    5. 1 def full_name
    6. 2 =======
    7. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) "#{first_name} #{last_name}" ======= >>>>>>> 31d15e66 (Fix) ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    8. <<<<<<< HEAD <<<<<<< HEAD end
    9. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors
    3. 1 decorates_association :categories
    4. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
    5. 1 <<<<<<< HEAD def self.collection_decorator_class
    6. 31 PaginatingDecorator
    7. end
    8. 1 delegate_all
    9. 1 def authors_names
    10. 90 authors.map(&:full_name).join(', ')
    11. end
    12. 1 def categories_names
    13. 1 categories.map(&:name).join(', ')
    14. end
    15. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 >>>>>>> aa7b40c (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4e81ea2 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 9d98d9ab (Featire specs) format: { with: Constants::NAME_FORMAT,
    5. message: 'Please enter first or last in correct format' }, allow_blank: true
    6. 1 validates :phone,
    7. length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
    8. format: { with: Constants::PHONE_FORMAT,
    9. message: 'Please enter phone in correct format' }, allow_blank: true
    10. 1 validates :address,
    11. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    12. format: { with: Constants::TEXT_FORMAT,
    13. message: 'Please enter address in correct format' }, allow_blank: true
    14. 1 validates :country, :city,
    15. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    16. format: { with: Constants::COUNTY_FORMAT,
    17. message: 'Please enter country in correct format' }, allow_blank: true
    18. 1 validates :zip,
    19. length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
    20. format: { with: Constants::ZIP_FORMAT,
    21. message: 'Please enter zip in correct format' }, allow_blank: true
    22. end
    <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased)

    app/models/admin_user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class AdminUser < ApplicationRecord
    2. <<<<<<< HEAD # Include default devise modules. Others available are: ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 >>>>>>> 9bfbd88 (Featire specs)
    3. <<<<<<< HEAD
    4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    5. =======
    6. >>>>>>> 752f0c0 (Featire specs) =======
    7. >>>>>>> bd8bda4 (Manifest_cache true) =======
    8. >>>>>>> 4e81ea2 (Featire specs) =======
    9. >>>>>>> aa7b40c (Manifest_cache true) =======
    10. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    11. 1 <<<<<<< HEAD DESCRIPTION_LENGTH = 25 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
    12. <<<<<<< HEAD =======
    13. 31 PaginatingDecorator
    14. end
    15. 1 delegate_all
    16. 1 def authors_names
    17. 90 authors.map(&:full_name).join(', ')
    18. end
    19. 1 def categories_names
    20. 1 categories.map(&:name).join(', ')
    21. end
    22. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs)
    4. PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 1 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end ======= devise :database_authenticatable, >>>>>>> c7a726c5 (Rebased)
    4. <<<<<<< HEAD

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> fc3774fd (Featire specs)
    3. <<<<<<< HEAD
    4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    5. >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    6. >>>>>>> 08edf50 (Featire specs) =======
    7. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    8. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    9. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
    10. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors
    3. 1 decorates_association :categories
    4. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def self.collection_decorator_class ======= >>>>>>> 34509eee (Featire specs) def self.collection_decorator_class <<<<<<< HEAD ======= ======= def self.collection_decorator_class
    6. 31 PaginatingDecorator
    7. end
    8. 1 delegate_all
    9. 1 def authors_names
    10. 90 authors.map(&:full_name).join(', ')
    11. end
    12. 1 def categories_names
    13. 1 categories.map(&:name).join(', ')
    14. end
    15. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD =======
    4. 31 PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 90 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs)
    4. PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 1 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 >>>>>>> aa7b40c (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4e81ea2 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) format: { with: Constants::NAME_FORMAT,
    5. message: 'Please enter first or last in correct format' }, allow_blank: true
    6. 1 validates :phone,
    7. length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
    8. format: { with: Constants::PHONE_FORMAT,
    9. message: 'Please enter phone in correct format' }, allow_blank: true
    10. 1 validates :address,
    11. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    12. format: { with: Constants::TEXT_FORMAT,
    13. message: 'Please enter address in correct format' }, allow_blank: true
    14. 1 validates :country, :city,
    15. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    16. format: { with: Constants::COUNTY_FORMAT,
    17. message: 'Please enter country in correct format' }, allow_blank: true
    18. 1 validates :zip,
    19. length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
    20. format: { with: Constants::ZIP_FORMAT,
    21. message: 'Please enter zip in correct format' }, allow_blank: true
    22. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 31d15e66 (Fix)

    app/models/admin_user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class AdminUser < ApplicationRecord
    2. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) # Include default devise modules. Others available are: ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 >>>>>>> df37394 (Featire specs) ======= # Include default devise modules. Others available are: >>>>>>> 0d6dd12 (Manifest_cache true) ======= # Include default devise modules. Others available are: >>>>>>> e3e66f3 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    5. =======
    6. >>>>>>> 752f0c0 (Featire specs) =======
    7. >>>>>>> bd8bda4 (Manifest_cache true) =======
    8. >>>>>>> 4e81ea2 (Featire specs) =======
    9. >>>>>>> aa7b40c (Manifest_cache true) =======
    10. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
    11. >>>>>>> 0d6dd12 (Manifest_cache true) =======
    12. >>>>>>> e3e66f3 (Featire specs) # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    13. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Include default devise modules. Others available are: ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= devise :database_authenticatable, >>>>>>> 9a49b7b (Rebased) ======= ======= devise :database_authenticatable, >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= devise :database_authenticatable, >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= devise :database_authenticatable, >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= =======
    14. >>>>>>> 84003439 (Featire specs) :recoverable, :rememberable, :validatable >>>>>>> c7a726c5 (Rebased)
    15. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    16. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    17. ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> f136376a (Featire specs)
    18. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 752f0c0 (Featire specs) =======
    19. >>>>>>> bd8bda4 (Manifest_cache true) =======
    20. >>>>>>> 4e81ea2 (Featire specs) =======
    21. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) =======
    22. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= =======
    23. >>>>>>> 08edf50 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= =======
    24. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
    25. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
    26. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    27. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
    28. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    29. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    30. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    31. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) =======
    32. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    33. 1 devise :database_authenticatable,
    34. :recoverable, :rememberable, :validatable
    35. ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= =======
    36. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= =======
    37. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    38. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= =======
    39. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    40. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    41. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    42. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end

    app/models/application_record.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class ApplicationRecord < ActiveRecord::Base
    2. 1 self.abstract_class = true
    3. end

    app/models/author.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 4 relevant lines. 4 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 4 relevant lines. 4 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 0 lines missed.
        
    1. 1 class Author < ApplicationRecord
    2. 1 has_many :authors_books, dependent: :destroy
    3. 1 has_many :books, through: :authors_books
    4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) validates :first_name, :last_name, presence: true ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :first_name, :last_name, presence: true ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= validates :first_name, :last_name, presence: true ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) validates :first_name, :last_name, presence: true ======= validates :first_name, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= validates :first_name, :last_name, presence: true >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD
    6. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    7. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    8. 1 validates :last_name, presence: true
    9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) =======
    10. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) end

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true ======= validates :first_name, :last_name, presence: true >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :first_name, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= validates :first_name, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= validates :first_name, :last_name, presence: true >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs)
    6. ======= <<<<<<< HEAD <<<<<<< HEAD
    7. ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
    8. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)
    9. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    10. 1 validates :last_name, presence: true
    11. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
    12. >>>>>>> 5b7749a (Fix) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) =======

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true <<<<<<< HEAD <<<<<<< HEAD ======= validates :first_name, :last_name, presence: true >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    6. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs)
    7. 1 validates :last_name, presence: true
    8. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :first_name, :last_name, presence: true >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD
    6. ======= <<<<<<< HEAD <<<<<<< HEAD
    7. ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs)
    8. 1 validates :last_name, presence: true
    9. <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true
    5. end
    <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    app/models/billing.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class Billing < Address
    2. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    app/models/book.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) 9 relevant lines. 9 lines covered and ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= 9 relevant lines. 9 lines covered and ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= 10 relevant lines. 10 lines covered and >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 8 relevant lines. 8 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 0 lines missed.
        
    1. 1 class Book < ApplicationRecord
    2. 1 has_many :authors_books, dependent: :destroy
    3. 1 has_many :authors, through: :authors_books
    4. 1 has_many :books_categories, dependent: :destroy
    5. 1 has_many :categories, through: :books_categories
    6. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) has_many :reviews, dependent: :destroy ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= has_many :reviews, dependent: :destroy ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= has_many :reviews, dependent: :destroy ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) has_many :reviews, dependent: :destroy ======= validates :title, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= validates :title, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :title, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= has_many :reviews, dependent: :destroy >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= validates :title, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= has_many_attached :images >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= has_many :reviews, dependent: :destroy >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    8. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    9. =======
    10. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    11. 1 >>>>>>> 752f0c0 (Featire specs) =======
    12. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    13. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
    14. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
    15. >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    16. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    17. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    18. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    19. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
    20. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    21. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
    22. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    23. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
    24. >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    25. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= validates :description, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :description, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= validates :description, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :description, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= validates :description, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= validates :description, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    26. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 84809242 (Featire specs) has_many_attached :images >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) has_many_attached :images ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= has_many_attached :images >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= has_many :reviews, dependent: :destroy >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= has_many_attached :images >>>>>>> 11792758 (Rebased)
    27. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    28. 1 <<<<<<< HEAD <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 4e81ea2 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= validates :price_cents, :quantity, presence: true, >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    29. <<<<<<< HEAD <<<<<<< HEAD numericality: ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD numericality: ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4e81ea2 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= numericality: >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    30. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    31. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    32. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    5. >>>>>>> 75fa7e1b (Rebased)
    6. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD
    7. >>>>>>> 311e9fa (Rebased) 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs)
    8. <<<<<<< HEAD
    9. =======
    10. >>>>>>> 824bb2b (Featire specs) 1 <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) validates :price_cents, :quantity, presence: true, ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= validates :price, :quantity, presence: true, <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs)
    11. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) numericality: ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs)
    12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS, >>>>>>> 824bb2b (Featire specs)
    13. <<<<<<< HEAD numericality: ======= less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS } >>>>>>> 824bb2b (Featire specs)
    14. <<<<<<< HEAD { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    15. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    16. ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. =======
    2. >>>>>>> d0dc1f1 (Featire specs) =======
    3. >>>>>>> 752f0c0 (Featire specs) =======
    4. >>>>>>> 4e81ea2 (Featire specs) =======
    5. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) =======
    6. >>>>>>> d0dc1f1 (Featire specs) =======
    7. >>>>>>> 752f0c0 (Featire specs) =======
    8. >>>>>>> 4e81ea2 (Featire specs) =======
    9. >>>>>>> 08edf50 (Featire specs) =======
    10. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD class BooksCategory < ApplicationRecord
    11. 1 belongs_to :category
    12. 1 belongs_to :book
    13. 1 validates :category, :book, presence: true
    14. ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    5. >>>>>>> 49e8a6c (Rebased)
    6. =======
    7. >>>>>>> d0dc1f1 (Featire specs) =======
    8. >>>>>>> 752f0c0 (Featire specs) =======
    9. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= =======
    10. >>>>>>> 08edf50 (Featire specs) =======
    11. >>>>>>> 7a02bbe (Featire specs) =======
    12. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) has_many_attached :images ======= <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs)
    13. 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 5b7749a (Fix)
    14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
    15. 1 =======
    16. >>>>>>> d0dc1f1 (Featire specs) =======
    17. >>>>>>> 752f0c0 (Featire specs) =======
    18. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    19. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    20. >>>>>>> 7a02bbe (Featire specs) =======
    21. >>>>>>> 4552227 (Featire specs) =======
    22. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) validates :price_cents, :quantity, presence: true, ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    23. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
    24. numericality:
    25. { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS, ======= validates :price_cents, :quantity, presence: true, >>>>>>> 5b7749a (Fix)
    26. numericality:
    27. <<<<<<< HEAD =======
    28. >>>>>>> d0dc1f1 (Featire specs) =======
    29. >>>>>>> 752f0c0 (Featire specs) =======
    30. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    31. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    32. >>>>>>> 08edf50 (Featire specs) =======
    33. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    34. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    35. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    36. >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. =======
    5. >>>>>>> 11792758 (Rebased)
    6. 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs)
    7. <<<<<<< HEAD
    8. =======
    9. >>>>>>> 824bb2b (Featire specs) 1 <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= <<<<<<< HEAD <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs)
    10. <<<<<<< HEAD <<<<<<< HEAD numericality: ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs)
    11. <<<<<<< HEAD <<<<<<< HEAD { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS, >>>>>>> 824bb2b (Featire specs)
    12. <<<<<<< HEAD numericality: ======= less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS } >>>>>>> 824bb2b (Featire specs)
    13. <<<<<<< HEAD { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    14. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    15. ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. 1 validates :category, :book, presence: true
    5. end

    app/models/category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class Category < ApplicationRecord
    2. 1 has_many :books_categories, dependent: :destroy
    3. 1 has_many :books, through: :books_categories
    4. 1 validates :name, presence: true
    5. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages)
    =======
    =======
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
    =======
    =======
    =======

    app/models/user.rb

    <<<<<<< HEAD =======

    app/models/review.rb

    >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 7 relevant lines. 7 lines covered and >>>>>>> aca90e3 (Rebased) 0 lines missed.
        
    1. 1 <<<<<<< HEAD ======= class Review < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 belongs_to :book
    4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
    6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
    7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
    8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
    9. 1 validates :rating,
    10. numericality: {
    11. greater_than_or_equal_to: Constants::STAR_MIN,
    12. less_than_or_equal_to: Constants::STAR_MAX
    13. }, presence: true
    14. end

    app/models/shipping.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class Shipping < Address
    2. end

    app/models/user.rb

    50.0% lines covered

    12 relevant lines. 6 lines covered and 6 lines missed.
        
    1. 1 >>>>>>> aca90e3 (Rebased) class User < ApplicationRecord
    2. <<<<<<< HEAD
    3. # Include default devise modules. Others available are:
    4. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    5. =======
    6. >>>>>>> aca90e3 (Rebased) 1 devise :database_authenticatable, :registerable,
    7. <<<<<<< HEAD
    8. =======
    9. >>>>>>> aca90e3 (Rebased) :recoverable, :rememberable, :validatable,
    10. <<<<<<< HEAD
    11. =======
    12. >>>>>>> aca90e3 (Rebased) :confirmable, :lockable, :timeoutable, :trackable,
    13. <<<<<<< HEAD
    14. =======
    15. >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD :omniauthable ======= :omniauthable, omniauth_providers: [:facebook] >>>>>>> aca90e3 (Rebased)
    16. <<<<<<< HEAD
    17. =======
    18. 1 has_one :billing, dependent: :destroy
    19. 1 has_one :shipping, dependent: :destroy
    20. 1 has_many :reviews, dependent: :destroy
    21. 1 def self.from_omniauth(auth)
    22. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
    23. user.provider = auth.provider
    24. user.uid = auth.uid
    25. user.name = auth.info.name
    26. user.email = auth.info.email
    27. user.password = Devise.friendly_token[0, 20]
    28. end
    29. end
    30. >>>>>>> aca90e3 (Rebased) end
    <<<<<<< HEAD
    >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages)

    app/models/user.rb

    100.0% <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs)

    app/queries/book_query.rb

    85.71% <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD =======
    >>>>>>> 5b7749a (Fix)

    app/models/coupon.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased)

    app/queries/book_query.rb

    <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5b7749a (Fix) lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 <<<<<<< HEAD class User < ApplicationRecord ======= class Coupon < ApplicationRecord >>>>>>> 5b7749a (Fix)
    2. <<<<<<< HEAD
    3. # Include default devise modules. Others available are:
    4. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    5. =======
    6. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD devise :database_authenticatable, :registerable, ======= belongs_to :order, optional: true >>>>>>> 5b7749a (Fix)
    7. <<<<<<< HEAD
    8. :recoverable, :rememberable, :validatable,
    9. :confirmable, :lockable, :timeoutable, :trackable,
    10. :omniauthable
    11. =======
    12. >>>>>>> 5b7749a (Fix) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages)
    >>>>>>> e1f4d17 (Add login registration pages) =======

    app/models/order.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class Order < ApplicationRecord
    2. 1 has_many :order_books, dependent: :destroy
    3. 1 has_many :books, through: :order_books
    4. 1 has_one :coupon, dependent: :nullify
    5. end

    app/models/order_book.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 class OrderBook < ApplicationRecord
    2. 1 belongs_to :order
    3. 1 belongs_to :book
    4. end
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)

    app/models/user.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

    app/models/user.rb

    <<<<<<< HEAD 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 85.71% >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)

    app/models/user.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 90.0% >>>>>>> c7a726c5 (Rebased) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) =======
    >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)

    app/models/review.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
    <<<<<<< HEAD =======

    app/models/user.rb

    100.0% ======= >>>>>>> a5d032d (Fix) lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs)
    >>>>>>> bae2b7de (Add login registration pages)

    app/models/user.rb

    <<<<<<< HEAD 100.0% ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= 85.71% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) lines covered

    <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) 7 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= 7 relevant lines. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= 7 relevant lines. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= 7 relevant lines. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 7 relevant lines. >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 7 relevant lines. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= 7 relevant lines. >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 7 lines covered and 0 lines missed.
        
    1. 1 class Review < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 belongs_to :book
    4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
    6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
    7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
    8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
    9. 1 validates :rating,
    10. numericality: {
    11. greater_than_or_equal_to: Constants::STAR_MIN,
    12. less_than_or_equal_to: Constants::STAR_MAX
    13. }, presence: true
    14. end

    app/models/shipping.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class Shipping < Address
    2. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)

    app/models/user.rb

    53.85% lines covered

    13 relevant lines. 7 lines covered and 6 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. 1 devise :database_authenticatable, :registerable,
    3. :recoverable, :rememberable, :validatable,
    4. :confirmable, :lockable, :timeoutable, :trackable,
    5. :omniauthable, omniauth_providers: [:facebook]
    6. 1 has_one :billing, dependent: :destroy
    7. 1 has_one :shipping, dependent: :destroy
    8. 1 has_one :order, dependent: :destroy
    9. 1 has_many :reviews, dependent: :destroy
    10. 1 def self.from_omniauth(auth)
    11. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
    12. user.provider = auth.provider
    13. user.uid = auth.uid
    14. user.name = auth.info.name
    15. user.email = auth.info.email
    16. user.password = Devise.friendly_token[0, 20]
    17. end
    18. end
    19. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 490b01d6 (Manifest_cache true)

    app/models/user.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) =======

    app/models/review.rb

    >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) 2 relevant lines. 2 lines covered and ======= 7 relevant lines. 7 lines covered and >>>>>>> aca90e3 (Rebased) 0 lines missed.
        
    1. 1 <<<<<<< HEAD ======= class Review < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 belongs_to :book
    4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
    6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
    7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
    8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
    9. 1 validates :rating,
    10. numericality: {
    11. greater_than_or_equal_to: Constants::STAR_MIN,
    12. less_than_or_equal_to: Constants::STAR_MAX
    13. }, presence: true
    14. end

    app/models/shipping.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class Shipping < Address
    2. end

    app/models/user.rb

    50.0% lines covered

    12 relevant lines. 6 lines covered and 6 lines missed.
        
    1. 1 >>>>>>> aca90e3 (Rebased) class User < ApplicationRecord
    2. <<<<<<< HEAD
    3. # Include default devise modules. Others available are:
    4. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    5. =======
    6. >>>>>>> aca90e3 (Rebased) 1 devise :database_authenticatable, :registerable,
    7. <<<<<<< HEAD
    8. =======
    9. >>>>>>> aca90e3 (Rebased) :recoverable, :rememberable, :validatable,
    10. <<<<<<< HEAD
    11. =======
    12. >>>>>>> aca90e3 (Rebased) :confirmable, :lockable, :timeoutable, :trackable,
    13. <<<<<<< HEAD
    14. =======
    15. >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD :omniauthable ======= :omniauthable, omniauth_providers: [:facebook] >>>>>>> aca90e3 (Rebased)
    16. <<<<<<< HEAD
    17. =======
    18. 1 has_one :billing, dependent: :destroy
    19. 1 has_one :shipping, dependent: :destroy
    20. 1 has_many :reviews, dependent: :destroy
    21. 1 def self.from_omniauth(auth)
    22. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
    23. user.provider = auth.provider
    24. user.uid = auth.uid
    25. user.name = auth.info.name
    26. user.email = auth.info.email
    27. user.password = Devise.friendly_token[0, 20]
    28. end
    29. end
    30. >>>>>>> aca90e3 (Rebased) end
    <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> aca90e3 (Rebased)

    app/queries/book_query.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> ae884b47 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= =======
    >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 87.5% >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 87.5% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) 87.5% ======= 85.71% >>>>>>> 752f0c0 (Featire specs) ======= 85.71% >>>>>>> 4e81ea2 (Featire specs) ======= 85.71% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 90.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 90.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> ae884b47 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= 90.0% >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 8 relevant lines. 7 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) 8 relevant lines. 7 lines covered and ======= 7 relevant lines. 6 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= 10 relevant lines. 9 lines covered and <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 10 relevant lines. 9 lines covered and >>>>>>> c7a726c5 (Rebased) ======= 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 1 lines missed.
        
    1. 1 class BookQuery
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 0d6dd12 (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c7a726c5 (Rebased) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 'title DESC'].freeze ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) 'title DESC'].freeze ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) 'title DESC'].freeze ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 'title DESC'].freeze ======= >>>>>>> c8da2e3 (Fix) ======= 'title DESC'].freeze ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 'title DESC'].freeze ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= 'title DESC'].freeze >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= 'title DESC'].freeze >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD 'title DESC'].freeze >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 'title DESC'].freeze >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 'title DESC'].freeze >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) 'title DESC'].freeze ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= 'title DESC'].freeze >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) def self.query(params)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    6. =======
    7. >>>>>>> 752f0c0 (Featire specs) =======
    8. >>>>>>> 4e81ea2 (Featire specs) 24 =======
    9. 25 >>>>>>> 1214e1f (Add login registration pages) =======
    10. 24 >>>>>>> 08edf50 (Featire specs) =======
    11. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    12. 30 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages)
    13. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    14. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
    15. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
    16. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs)
    17. 24 <<<<<<< HEAD ======= =======
    18. 25 >>>>>>> 1214e1f (Add login registration pages) =======
    19. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    20. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
    21. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
    22. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    23. 30 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    24. 30 =======
    25. 30 >>>>>>> 9620751 (Featire specs) =======
    26. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    27. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    28. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    29. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    30. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    31. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    32. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
    33. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    34. 30 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
    35. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    36. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) ======= ======= =======
    37. 25 <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
    38. 30 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= =======
    39. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= =======
    40. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
    41. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    42. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= =======
    43. 30 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    45. 12 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    46. 12 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) =======
    47. 12 ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs)
    48. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
    49. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    50. =======
    51. >>>>>>> 752f0c0 (Featire specs) =======
    52. >>>>>>> 4e81ea2 (Featire specs) =======
    53. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    54. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    55. 12 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    56. 12 =======
    57. 12 >>>>>>> 9620751 (Featire specs) =======
    58. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    59. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    60. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    61. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
    62. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    63. =======
    64. >>>>>>> 752f0c0 (Featire specs) =======
    65. >>>>>>> 4e81ea2 (Featire specs) =======
    66. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
    67. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    68. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    69. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
    70. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    71. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
    72. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    73. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    74. 7 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    75. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    76. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    77. 12 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    78. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= =======
    79. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    80. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
    81. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
    82. 12 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) if params[:category].nil?
    83. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    84. 12 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    85. 12 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) =======
    86. 12 ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs)
    87. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
    88. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    89. =======
    90. >>>>>>> 752f0c0 (Featire specs) =======
    91. >>>>>>> 4e81ea2 (Featire specs) =======
    92. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    93. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    94. 12 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    95. 12 =======
    96. 12 >>>>>>> 9620751 (Featire specs) =======
    97. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    98. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    99. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    100. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
    101. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    102. =======
    103. >>>>>>> 752f0c0 (Featire specs) =======
    104. >>>>>>> 4e81ea2 (Featire specs) =======
    105. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
    106. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    107. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    108. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
    109. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    110. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
    111. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    112. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    113. 7 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    114. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= ======= =======
    115. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
    116. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) ======= ======= =======
    117. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= =======
    118. 12 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    119. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    120. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    121. 12 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Book.order(params[:sort]) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) Book.order(params[:sort]) ======= Book.all.order(params[:sort]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= Book.order(params[:sort]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= Book.order(params[:sort]) >>>>>>> c7a726c5 (Rebased) ======= ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= Book.order(params[:sort]) >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    122. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    123. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs)
    124. =======
    125. >>>>>>> 752f0c0 (Featire specs) =======
    126. >>>>>>> 4e81ea2 (Featire specs) =======
    127. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    128. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    129. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    130. =======
    131. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    132. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    133. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
    134. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    135. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    136. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    137. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    138. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    139. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    140. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    141. =======
    142. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    143. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    144. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    145. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    146. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    147. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    148. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    149. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    150. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    151. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    152. >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) else
    153. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    154. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs)
    155. =======
    156. >>>>>>> 752f0c0 (Featire specs) =======
    157. >>>>>>> 4e81ea2 (Featire specs) =======
    158. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    159. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    160. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    161. =======
    162. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    163. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    164. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
    165. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    166. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
    167. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    168. >>>>>>> a5d032d (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    169. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    170. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    171. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    172. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    173. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    174. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    175. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    176. =======
    177. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    178. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    179. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    180. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    181. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    182. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    183. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    184. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    185. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    186. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    187. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> c7a726c5 (Rebased) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    188. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    189. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs)
    190. =======
    191. >>>>>>> 752f0c0 (Featire specs) =======
    192. >>>>>>> 4e81ea2 (Featire specs) =======
    193. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    194. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    195. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    196. =======
    197. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    198. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    199. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
    200. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    201. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    202. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    203. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    204. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    205. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    206. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    207. =======
    208. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    209. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    210. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    211. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    212. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    213. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    214. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    215. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    216. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    217. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    218. >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    219. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    220. 18 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    221. 18 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    222. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    223. =======
    224. >>>>>>> 752f0c0 (Featire specs) =======
    225. >>>>>>> 4e81ea2 (Featire specs) =======
    226. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= =======
    227. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs)
    228. 18 ======= <<<<<<< HEAD
    229. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    230. =======
    231. >>>>>>> 752f0c0 (Featire specs) =======
    232. >>>>>>> 4e81ea2 (Featire specs) =======
    233. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= =======
    234. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs)
    235. 18 elsif params[:category].nil?
    236. 16 Book.all
    237. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> c033601 (Rebased) ======= =======
    238. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    239. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
    240. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
    241. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
    242. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
    243. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= =======
    244. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) elsif params[:category].nil?
    245. <<<<<<< HEAD
    246. 16 ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    247. 17 <<<<<<< HEAD ======= =======
    248. 18 >>>>>>> 1214e1f (Add login registration pages) =======
    249. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) Book.all
    250. <<<<<<< HEAD
    251. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) >>>>>>> c033601 (Rebased) ======= =======
    252. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    253. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    254. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= =======
    255. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
    256. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    257. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    258. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= =======
    259. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    260. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    261. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> 4bf888bf (Featire specs) >>>>>>> 9bfbd88 (Featire specs) elsif params[:category].nil?
    262. <<<<<<< HEAD <<<<<<< HEAD
    263. 16 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    264. 16 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    265. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs)
    266. 17 <<<<<<< HEAD ======= =======
    267. 18 >>>>>>> 1214e1f (Add login registration pages) =======
    268. 17 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= =======
    269. 17 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= =======
    270. 18 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= =======
    271. 2 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    272. 2 =======
    273. 2 >>>>>>> 9620751 (Featire specs) =======
    274. 17 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    275. 17 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    276. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> bae2b7de (Add login registration pages) =======
    277. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
    278. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= =======
    279. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= =======
    280. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
    281. 18 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
    282. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD Book.all ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Book.all ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> bf05825 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    283. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs)
    284. >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs)
    285. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    286. =======
    287. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    288. >>>>>>> 9c0d812 (Featire specs) =======
    289. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    290. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
    291. =======
    292. >>>>>>> 752f0c0 (Featire specs) =======
    293. >>>>>>> 4e81ea2 (Featire specs) =======
    294. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= =======
    295. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    296. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    297. =======
    298. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    299. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    300. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    301. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    302. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    303. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    304. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    305. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    306. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) else
    307. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
    308. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages)
    309. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs)
    310. =======
    311. >>>>>>> 752f0c0 (Featire specs) =======
    312. >>>>>>> 4e81ea2 (Featire specs) 17 ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    313. 17 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    314. 18 >>>>>>> 1214e1f (Add login registration pages) =======
    315. 17 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    316. 17 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
    317. 18 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3c (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
    318. 18 >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    319. 2 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= ======= =======
    320. 2 >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) =======
    321. 2 >>>>>>> e3e66f3 (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
    322. 18 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) =======
    323. 2 >>>>>>> c033601 (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
    324. 2 ======= ======= >>>>>>> e3e66f3 (Featire specs)
    325. 2 =======
    326. 2 >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    327. 17 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    328. 17 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    329. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    330. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= =======
    331. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    332. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    333. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
    334. 18 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    335. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
    336. 17 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    337. 17 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    338. 18 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
    339. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= =======
    340. 2 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
    341. 18 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) =======
    342. 2 >>>>>>> c033601 (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
    343. 2 =======
    344. 17 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
    345. 17 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
    346. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
    347. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
    348. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= =======
    349. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
    350. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    351. 18 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= =======
    352. 2 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 31d15e66 (Fix) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    353. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs)
    354. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    355. ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
    356. ======= <<<<<<< HEAD
    357. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    358. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    359. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    360. >>>>>>> 94841b5 (Featire specs) =======
    361. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    362. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    363. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    364. >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    365. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    366. ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    367. >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
    368. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    369. >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    370. >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
    371. =======
    372. >>>>>>> 752f0c0 (Featire specs) =======
    373. >>>>>>> 4e81ea2 (Featire specs) =======
    374. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    375. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    376. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    377. =======
    378. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    379. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) =======
    380. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    381. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    382. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    383. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
    384. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    385. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    386. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    387. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    388. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    389. =======
    390. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    391. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    392. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    393. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    394. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    395. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    396. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    397. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    398. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    399. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= =======
    400. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    401. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
    402. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
    403. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    404. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    405. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    406. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
    407. =======
    408. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
    409. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    410. =======
    411. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    412. >>>>>>> 94841b5 (Featire specs) =======
    413. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    414. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    415. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    416. >>>>>>> e54deeb (Featire specs) =======
    417. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    418. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
    419. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    420. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
    421. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
    422. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    423. =======
    424. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    425. >>>>>>> 9c0d812 (Featire specs) =======
    426. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    427. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
    428. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    429. =======
    430. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    431. >>>>>>> 9c0d812 (Featire specs) =======
    432. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    433. >>>>>>> 3723aad (Featire specs) ======= =======
    434. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
    435. =======
    436. >>>>>>> 752f0c0 (Featire specs) =======
    437. >>>>>>> 4e81ea2 (Featire specs) =======
    438. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
    439. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
    440. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    441. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    442. =======
    443. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
    444. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    445. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    446. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    447. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    448. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
    449. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    450. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    451. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    452. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    453. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    454. =======
    455. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    456. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    457. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    458. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    459. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    460. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    461. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    462. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    463. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    464. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= =======
    465. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    466. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
    467. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
    468. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    469. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    470. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    471. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
    472. =======
    473. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
    474. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    475. =======
    476. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    477. >>>>>>> 94841b5 (Featire specs) =======
    478. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    479. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    480. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    481. >>>>>>> e54deeb (Featire specs) =======
    482. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    483. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
    484. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    485. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
    486. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
    487. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    488. =======
    489. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    490. >>>>>>> 9c0d812 (Featire specs) =======
    491. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    492. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
    493. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    494. =======
    495. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    496. >>>>>>> 9c0d812 (Featire specs) =======
    497. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    498. >>>>>>> 3723aad (Featire specs) ======= =======
    499. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
    500. =======
    501. >>>>>>> 752f0c0 (Featire specs) =======
    502. >>>>>>> 4e81ea2 (Featire specs) =======
    503. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
    504. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
    505. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    506. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    507. =======
    508. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
    509. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    510. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    511. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    512. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    513. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
    514. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    515. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    516. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    517. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    518. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    519. =======
    520. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    521. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    522. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    523. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    524. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    525. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    526. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    527. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    528. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    529. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= =======
    530. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    531. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
    532. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
    533. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======

    app/services/book_service.rb

    88.89% lines covered

    9 relevant lines. 8 lines covered and 1 lines missed.
        
    1. 1 class BookService
    2. 1 def self.quantity_update(params, product, order, book, coupon)
    3. 2 discount = 0
    4. 2 product.update(quantity: params[:quantity]) if params[:quantity].to_i <= book.quantity
    5. 2 discount = coupon.discount unless coupon.nil?
    6. 2 if product.save
    7. {
    8. 2 total_price: order.decorate.order_price(discount).to_s,
    9. sub_price: order.decorate.order_price.to_s,
    10. price: product.decorate.total_price.to_s,
    11. 2 discount: (order.decorate.order_price * discount).to_s,
    12. book_quantity: book.quantity
    13. }
    14. else
    15. { notice: 'Error!' }
    16. end
    17. end
    18. end

    app/services/coupon_service.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 class CouponService
    2. 1 def self.find_coupon(params, order, coupon)
    3. 4 error_message = I18n.t('order.coupon.error')
    4. 4 if coupon.nil?
    5. 1 error_message = ' ' if params[:code].eql?('')
    6. {
    7. 1 error: error_message,
    8. total_price: order.decorate.order_price.to_s
    9. }
    10. else
    11. {
    12. 3 total_price: order.decorate.order_price(coupon.discount).to_s,
    13. 3 discount: (order.decorate.order_price * coupon.discount).to_s
    14. }
    15. end
    16. end
    17. end
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    config/application.rb

    100.0% lines covered

    6 relevant lines. 6 lines covered and 0 lines missed.
        
    1. 1 require_relative 'boot'
    2. 1 require 'rails/all'
    3. # Require the gems listed in Gemfile, including any gems
    4. # you've limited to :test, :development, or :production.
    5. 1 Bundler.require(*Rails.groups)
    6. 1 module BookStore
    7. 1 class Application < Rails::Application
    8. # Initialize configuration defaults for originally generated Rails version.
    9. 1 config.load_defaults 6.1
    10. # Configuration for the application, engines, and railties goes here.
    11. #
    12. # These settings can be overridden in specific environments using the files
    13. # in config/environments, which are processed later.
    14. #
    15. # config.time_zone = "Central Time (US & Canada)"
    16. # config.eager_load_paths << Rails.root.join("extras")
    17. end
    18. end

    config/boot.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
    2. 1 require 'bundler/setup' # Set up gems listed in the Gemfile.
    3. 1 require 'bootsnap/setup' # Speed up boot time by caching expensive operations.

    config/environment.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. # Load the Rails application.
    2. 1 require_relative 'application'
    3. # Initialize the Rails application.
    4. 1 Rails.application.initialize!

    config/environments/test.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 19 relevant lines. 19 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 19 relevant lines. 19 lines covered and ======= 18 relevant lines. 18 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 19 relevant lines. 19 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= 19 relevant lines. 19 lines covered and >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 19 relevant lines. 19 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 0 lines missed.
        
    1. 1 require 'active_support/core_ext/integer/time'
    2. # The test environment is used exclusively to run your application's
    3. # test suite. You never need to work with it otherwise. Remember that
    4. # your test database is "scratch space" for the test suite and is wiped
    5. # and recreated between test runs. Don't rely on the data there!
    6. 1 Rails.application.configure do
    7. # Settings specified here will take precedence over those in config/application.rb.
    8. 1 config.cache_classes = false
    9. 1 config.action_view.cache_template_loading = true
    10. # Do not eager load code on boot. This avoids loading your whole application
    11. # just for the purpose of running a single test. If you are using a tool that
    12. # preloads Rails for running tests, you may have to set it to true.
    13. 1 config.eager_load = false
    14. # Configure public file server for tests with Cache-Control for performance.
    15. 1 config.public_file_server.enabled = true
    16. 1 config.public_file_server.headers = {
    17. 'Cache-Control' => "public, max-age=#{1.hour.to_i}"
    18. }
    19. # Show full error reports and disable caching.
    20. 1 config.consider_all_requests_local = true
    21. 1 config.action_controller.perform_caching = false
    22. 1 config.cache_store = :null_store
    23. # Raise exceptions instead of rendering exception templates.
    24. 1 config.action_dispatch.show_exceptions = false
    25. # Disable request forgery protection in test environment.
    26. 1 config.action_controller.allow_forgery_protection = false
    27. # Store uploaded files on the local file system in a temporary directory.
    28. 1 config.active_storage.service = :test
    29. 1 config.action_mailer.perform_caching = false
    30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    31. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    32. 1 =======
    33. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    34. >>>>>>> 752f0c0 (Featire specs) =======
    35. >>>>>>> 4e81ea2 (Featire specs) =======
    36. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
    37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
    38. 1 >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    39. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    40. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    41. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    42. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
    43. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    44. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
    45. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    46. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
    47. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    48. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    49. # Tell Action Mailer not to deliver emails to the real world.
    50. # The :test delivery method accumulates sent emails in the
    51. # ActionMailer::Base.deliveries array.
    52. 1 config.action_mailer.delivery_method = :test
    53. # Print deprecation notices to the stderr.
    54. 1 config.active_support.deprecation = :stderr
    55. # Raise exceptions for disallowed deprecations.
    56. 1 config.active_support.disallowed_deprecation = :raise
    57. # Tell Active Support which deprecation messages to disallow.
    58. 1 config.active_support.disallowed_deprecation_warnings = []
    59. # Raises error for missing translations.
    60. # config.i18n.raise_on_missing_translations = true
    61. # Annotate rendered view with file names.
    62. # config.action_view.annotate_rendered_view_with_filenames = true
    63. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    config/initializers/active_admin.rb

    100.0% lines covered

    11 relevant lines. 11 lines covered and 0 lines missed.
        
    1. 1 ActiveAdmin.setup do |config|
    2. 1 config.site_title = 'Book Store'
    3. 1 config.authentication_method = :authenticate_admin_user!
    4. 1 config.current_user_method = :current_admin_user
    5. 1 config.logout_link_path = :destroy_admin_user_session_path
    6. 1 config.batch_actions = true
    7. 1 config.filter_attributes = %i[encrypted_password password password_confirmation]
    8. 1 config.localize_format = :long
    9. 1 config.default_per_page = 30
    10. 1 config.max_per_page = 10_000
    11. 1 config.use_webpacker = true
    12. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    config/initializers/application_controller_renderer.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # ActiveSupport::Reloader.to_prepare do
    3. # ApplicationController.renderer.defaults.merge!(
    4. # http_host: 'example.org',
    5. # https: false
    6. # )
    7. # end

    config/initializers/assets.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Version of your assets, change this if you want to expire all your assets.
    3. 1 Rails.application.config.assets.version = '1.0'
    4. # Add additional assets to the asset load path.
    5. # Rails.application.config.assets.paths << Emoji.images_path
    6. # Add Yarn node_modules folder to the asset load path.
    7. 1 Rails.application.config.assets.paths << Rails.root.join('node_modules')
    8. # Precompile additional assets.
    9. # application.js, application.css, and all non-JS/CSS in the app/assets
    10. # folder are already added.
    11. # Rails.application.config.assets.precompile += %w( admin.js admin.css )

    config/initializers/backtrace_silencers.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
    3. # Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
    4. # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
    5. # by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
    6. 1 Rails.backtrace_cleaner.remove_silencers! if ENV['BACKTRACE']

    config/initializers/content_security_policy.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Define an application-wide content security policy
    3. # For further information see the following documentation
    4. # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
    5. # Rails.application.config.content_security_policy do |policy|
    6. # policy.default_src :self, :https
    7. # policy.font_src :self, :https, :data
    8. # policy.img_src :self, :https, :data
    9. # policy.object_src :none
    10. # policy.script_src :self, :https
    11. # policy.style_src :self, :https
    12. # # If you are using webpack-dev-server then specify webpack-dev-server host
    13. # policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
    14. # # Specify URI for violation reports
    15. # # policy.report_uri "/csp-violation-report-endpoint"
    16. # end
    17. # If you are using UJS then enable automatic nonce generation
    18. # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
    19. # Set the nonce only to specific directives
    20. # Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
    21. # Report CSP violations to a specified URI
    22. # For further information see the following documentation:
    23. # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
    24. # Rails.application.config.content_security_policy_report_only = true

    config/initializers/cookies_serializer.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Specify a serializer for the signed and encrypted cookie jars.
    3. # Valid options are :json, :marshal, and :hybrid.
    4. 1 Rails.application.config.action_dispatch.cookies_serializer = :json
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    config/initializers/devise.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) 14 relevant lines. 14 lines covered and ======= 13 relevant lines. 13 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= 13 relevant lines. 13 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 11792758 (Rebased) ======= 14 relevant lines. 14 lines covered and >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= 14 relevant lines. 14 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= 13 relevant lines. 13 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 14 relevant lines. 14 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) 0 lines missed.
        
    1. # frozen_string_literal: true
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages)
    3. 1 =======
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) =======
    5. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= >>>>>>> e60833c (Add login registration pages) =======
    6. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) =======
    7. 1 >>>>>>> aa3618b (Rebased) =======
    8. 1 >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    9. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) =======
    10. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= =======
    11. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= =======
    12. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) =======
    13. 1 >>>>>>> 5b7749a (Fix) ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
    14. 1 >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= =======
    15. 1 >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) Devise.setup do |config| <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Assuming you have not yet modified this file, each configuration option below <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 793a6ed (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) Devise.setup do |config| <<<<<<< HEAD <<<<<<< HEAD ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= Devise.setup do |config| >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= Devise.setup do |config| >>>>>>> 5b7749a (Fix) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages)
    17. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    18. >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased)
    19. 1 <<<<<<< HEAD <<<<<<< HEAD =======
    20. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    21. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    22. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    23. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) =======
    24. 1 >>>>>>> 5b7749a (Fix) config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' <<<<<<< HEAD ======= # is set to its default value. Note that some are commented out while others <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    25. 1 <<<<<<< HEAD =======
    26. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    27. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    28. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    29. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) require 'devise/orm/active_record' <<<<<<< HEAD ======= # are not: uncommented lines are intended to protect your configuration from <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    30. 1 <<<<<<< HEAD =======
    31. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    32. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    33. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    34. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) config.case_insensitive_keys = [:email] <<<<<<< HEAD ======= # breaking changes in upgrades (i.e., in the event that future versions of <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    35. 1 <<<<<<< HEAD =======
    36. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    37. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    38. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    39. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) config.strip_whitespace_keys = [:email] <<<<<<< HEAD ======= # Devise change the default values for those options). <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # Devise change the default values for those options). >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    40. 1 <<<<<<< HEAD =======
    41. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    42. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    43. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    44. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) config.skip_session_storage = [:http_auth] <<<<<<< HEAD ======= # <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= # >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    45. 1 <<<<<<< HEAD =======
    46. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    47. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    48. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    49. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) config.stretches = Rails.env.test? ? 1 : 12 <<<<<<< HEAD ======= # Use this hook to configure devise mailer, warden hooks and so forth. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    50. 1 <<<<<<< HEAD =======
    51. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    52. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    53. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    54. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) config.reconfirmable = true <<<<<<< HEAD ======= # Many of these configuration options can be set straight in your model. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    55. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD =======
    56. >>>>>>> 9a49b7b (Rebased) >>>>>>> 89d7dcd2 (Manifest_cache true) =======
    57. >>>>>>> c7a726c5 (Rebased) 1 ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) ======= 1 >>>>>>> 0d6dd12 (Manifest_cache true) ======= 1 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 9bfbd88 (Featire specs) ======= Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= Devise.setup do |config| >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= Devise.setup do |config| >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= Devise.setup do |config| >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 5b7749a (Fix)
    58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages)
    59. 1 =======
    60. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    61. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    62. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    63. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) =======
    64. 1 >>>>>>> 5b7749a (Fix) config.password_length = 6..128 <<<<<<< HEAD ======= # The secret key used by Devise. Devise uses this key to generate <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    65. 1 <<<<<<< HEAD =======
    66. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    67. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    68. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    69. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ <<<<<<< HEAD ======= # random tokens. Changing this key will render invalid all existing <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    70. 1 <<<<<<< HEAD =======
    71. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    72. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    73. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    74. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) config.reset_password_within = 6.hours <<<<<<< HEAD ======= # confirmation, reset password and unlock tokens in the database. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    75. 1 <<<<<<< HEAD =======
    76. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    77. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    78. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    79. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) config.sign_out_via = :delete <<<<<<< HEAD ======= # Devise will use the `secret_key_base` as its `secret_key` <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    80. 1 <<<<<<< HEAD =======
    81. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    82. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    83. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    84. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) config.omniauth :facebook, <<<<<<< HEAD ======= # by default. You can change it below and use your own secret key. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    85. Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), <<<<<<< HEAD ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    86. Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    87. scope: 'email', info_fields: 'email,name' <<<<<<< HEAD ======= # ==> Controller configuration <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # ==> Controller configuration >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix)
    88. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) # Configure the parent class to the devise controllers.
    89. # config.parent_controller = 'DeviseController'
    90. # ==> Mailer Configuration
    91. # Configure the e-mail address which will be shown in Devise::Mailer,
    92. # note that it will be overwritten if you use your own mailer class
    93. # with default "from" parameter.
    94. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 156ffe6 (Add login registration pages)
    95. >>>>>>> 9a49b7b (Rebased) >>>>>>> 6066f925 (Add login registration pages) 1 =======
    96. >>>>>>> 1214e1f (Add login registration pages) =======
    97. >>>>>>> 730a8ca (Add login registration pages) =======
    98. >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    99. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    100. >>>>>>> 730a8ca (Add login registration pages) =======
    101. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= =======
    102. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 1214e1f (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' >>>>>>> 49e8a6c (Rebased)
    103. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    104. # Configure the class responsible to send e-mails.
    105. # config.mailer = 'Devise::Mailer'
    106. # Configure the parent class responsible to send e-mails.
    107. # config.parent_mailer = 'ActionMailer::Base'
    108. # ==> ORM configuration
    109. # Load and configure the ORM. Supports :active_record (default) and
    110. # :mongoid (bson_ext recommended) by default. Other ORMs may be
    111. # available as additional gems.
    112. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    113. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    114. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    115. >>>>>>> 730a8ca (Add login registration pages) =======
    116. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    117. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 1214e1f (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= require 'devise/orm/active_record' >>>>>>> 49e8a6c (Rebased)
    118. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    119. # ==> Configuration for any authentication mechanism
    120. # Configure which keys are used when authenticating a user. The default is
    121. # just :email. You can configure it to use [:username, :subdomain], so for
    122. # authenticating a user, both parameters are required. Remember that those
    123. # parameters are used only when authenticating and not when retrieving from
    124. # session. If you need permissions, you should implement that in a before filter.
    125. # You can also supply a hash where the value is a boolean determining whether
    126. # or not authentication should be aborted when the value is not present.
    127. # config.authentication_keys = [:email]
    128. # Configure parameters from the request object used for authentication. Each entry
    129. # given should be a request method and it will automatically be passed to the
    130. # find_for_authentication method and considered in your model lookup. For instance,
    131. # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
    132. # The same considerations mentioned for authentication_keys also apply to request_keys.
    133. # config.request_keys = []
    134. # Configure which authentication keys should be case-insensitive.
    135. # These keys will be downcased upon creating or modifying a user and when used
    136. # to authenticate or find a user. Default is :email.
    137. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    138. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    139. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    140. >>>>>>> 730a8ca (Add login registration pages) =======
    141. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    142. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 1214e1f (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.case_insensitive_keys = [:email] >>>>>>> 49e8a6c (Rebased)
    143. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    144. # Configure which authentication keys should have whitespace stripped.
    145. # These keys will have whitespace before and after removed upon creating or
    146. # modifying a user and when used to authenticate or find a user. Default is :email.
    147. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    148. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    149. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    150. >>>>>>> 730a8ca (Add login registration pages) =======
    151. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    152. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 1214e1f (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.strip_whitespace_keys = [:email] >>>>>>> 49e8a6c (Rebased)
    153. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    154. # Tell if authentication through request.params is enabled. True by default.
    155. # It can be set to an array that will enable params authentication only for the
    156. # given strategies, for example, `config.params_authenticatable = [:database]` will
    157. # enable it only for database (email + password) authentication.
    158. # config.params_authenticatable = true
    159. # Tell if authentication through HTTP Auth is enabled. False by default.
    160. # It can be set to an array that will enable http authentication only for the
    161. # given strategies, for example, `config.http_authenticatable = [:database]` will
    162. # enable it only for database authentication.
    163. # For API-only applications to support authentication "out-of-the-box", you will likely want to
    164. # enable this with :database unless you are using a custom strategy.
    165. # The supported strategies are:
    166. # :database = Support basic authentication with authentication key + password
    167. # config.http_authenticatable = false
    168. # If 401 status code should be returned for AJAX requests. True by default.
    169. # config.http_authenticatable_on_xhr = true
    170. # The realm used in Http Basic Authentication. 'Application' by default.
    171. # config.http_authentication_realm = 'Application'
    172. # It will change confirmation, password recovery and other workflows
    173. # to behave the same regardless if the e-mail provided was right or wrong.
    174. # Does not affect registerable.
    175. # config.paranoid = true
    176. # By default Devise will store the user in session. You can skip storage for
    177. # particular strategies by setting this option.
    178. # Notice that if you are skipping storage for all authentication paths, you
    179. # may want to disable generating routes to Devise's sessions controller by
    180. # passing skip: :sessions to `devise_for` in your config/routes.rb
    181. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    182. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    183. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    184. >>>>>>> 730a8ca (Add login registration pages) =======
    185. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    186. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 1214e1f (Add login registration pages) ======= # >>>>>>> 730a8ca (Add login registration pages) ======= # >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.skip_session_storage = [:http_auth] >>>>>>> 49e8a6c (Rebased)
    187. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    188. # By default, Devise cleans up the CSRF token on authentication to
    189. # avoid CSRF token fixation attacks. This means that, when using AJAX
    190. # requests for sign in and sign up, you need to get a new CSRF token
    191. # from the server. You can disable this option at your own risk.
    192. # config.clean_up_csrf_token_on_authentication = true
    193. # When false, Devise will not attempt to reload routes on eager load.
    194. # This can reduce the time taken to boot the app but if your application
    195. # requires the Devise mappings to be loaded during boot time the application
    196. # won't boot properly.
    197. # config.reload_routes = true
    198. # ==> Configuration for :database_authenticatable
    199. # For bcrypt, this is the cost for hashing the password and defaults to 12. If
    200. # using other algorithms, it sets how many times you want the password to be hashed.
    201. # The number of stretches used for generating the hashed password are stored
    202. # with the hashed password. This allows you to change the stretches without
    203. # invalidating existing passwords.
    204. #
    205. # Limiting the stretches to just one in testing will increase the performance of
    206. # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
    207. # a value less than 10 in other environments. Note that, for bcrypt (the default
    208. # algorithm), the cost increases exponentially with the number of stretches (e.g.
    209. # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
    210. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    211. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    212. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    213. >>>>>>> 730a8ca (Add login registration pages) =======
    214. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    215. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 1214e1f (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.stretches = Rails.env.test? ? 1 : 12 >>>>>>> 49e8a6c (Rebased)
    216. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    217. # Set up a pepper to generate the hashed password.
    218. # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
    219. # Send a notification to the original email when the user's email is changed.
    220. # config.send_email_changed_notification = false
    221. # Send a notification email when the user's password is changed.
    222. # config.send_password_change_notification = false
    223. # ==> Configuration for :confirmable
    224. # A period that the user is allowed to access the website even without
    225. # confirming their account. For instance, if set to 2.days, the user will be
    226. # able to access the website for two days without confirming their account,
    227. # access will be blocked just in the third day.
    228. # You can also set it to nil, which will allow the user to access the website
    229. # without confirming their account.
    230. # Default is 0.days, meaning the user cannot access the website without
    231. # confirming their account.
    232. # config.allow_unconfirmed_access_for = 2.days
    233. # A period that the user is allowed to confirm their account before their
    234. # token becomes invalid. For example, if set to 3.days, the user can confirm
    235. # their account within 3 days after the mail was sent, but on the fourth day
    236. # their account can't be confirmed with the token any more.
    237. # Default is nil, meaning there is no restriction on how long a user can take
    238. # before confirming their account.
    239. # config.confirm_within = 3.days
    240. # If true, requires any email changes to be confirmed (exactly the same way as
    241. # initial account confirmation) to be applied. Requires additional unconfirmed_email
    242. # db field (see migrations). Until confirmed, new email is stored in
    243. # unconfirmed_email column, and copied to email column on successful confirmation.
    244. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    245. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    246. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    247. >>>>>>> 730a8ca (Add login registration pages) =======
    248. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    249. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 1214e1f (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.reconfirmable = true >>>>>>> 49e8a6c (Rebased)
    250. # Defines which key will be used when confirming an account
    251. # config.confirmation_keys = [:email]
    252. # ==> Configuration for :rememberable
    253. # The time the user will be remembered without asking for credentials again.
    254. # config.remember_for = 2.weeks
    255. # Invalidates all the remember me tokens when the user signs out.
    256. 1 ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 1214e1f (Add login registration pages) ======= Devise.setup do |config| >>>>>>> 730a8ca (Add login registration pages) ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 49e8a6c (Rebased) ======= Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs)
    257. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    258. # If true, extends the user's remember period when remembered via cookie.
    259. # config.extend_remember_period = false
    260. # Options to be passed to the created cookie. For instance, you can set
    261. # secure: true in order to force SSL only cookies.
    262. # config.rememberable_options = {}
    263. # ==> Configuration for :validatable
    264. # Range for password length.
    265. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    266. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    267. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    268. >>>>>>> 730a8ca (Add login registration pages) =======
    269. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    270. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 1214e1f (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.password_length = 6..128 >>>>>>> 49e8a6c (Rebased)
    271. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    272. # Email regex used to validate email formats. It simply asserts that
    273. # one (and only one) @ exists in the given string. This is mainly
    274. # to give user feedback and not to assert the e-mail validity.
    275. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    276. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    277. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    278. >>>>>>> 730a8ca (Add login registration pages) =======
    279. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    280. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 1214e1f (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ >>>>>>> 49e8a6c (Rebased)
    281. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    282. # ==> Configuration for :timeoutable
    283. # The time you want to timeout the user session without activity. After this
    284. # time the user will be asked for credentials again. Default is 30 minutes.
    285. # config.timeout_in = 30.minutes
    286. # ==> Configuration for :lockable
    287. # Defines which strategy will be used to lock an account.
    288. # :failed_attempts = Locks an account after a number of failed attempts to sign in.
    289. # :none = No lock strategy. You should handle locking by yourself.
    290. # config.lock_strategy = :failed_attempts
    291. # Defines which key will be used when locking and unlocking an account
    292. # config.unlock_keys = [:email]
    293. # Defines which strategy will be used to unlock an account.
    294. # :email = Sends an unlock link to the user email
    295. # :time = Re-enables login after a certain amount of time (see :unlock_in below)
    296. # :both = Enables both strategies
    297. # :none = No unlock strategy. You should handle unlocking by yourself.
    298. # config.unlock_strategy = :both
    299. # Number of authentication tries before locking an account if lock_strategy
    300. # is failed attempts.
    301. # config.maximum_attempts = 20
    302. # Time interval to unlock the account if :time is enabled as unlock_strategy.
    303. # config.unlock_in = 1.hour
    304. # Warn on the last attempt before the account is locked.
    305. # config.last_attempt_warning = true
    306. # ==> Configuration for :recoverable
    307. #
    308. # Defines which key will be used when recovering the password for an account
    309. # config.reset_password_keys = [:email]
    310. # Time interval you can reset your password with a reset password key.
    311. # Don't put a too small interval or your users won't have the time to
    312. # change their passwords.
    313. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    314. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    315. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    316. >>>>>>> 730a8ca (Add login registration pages) =======
    317. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    318. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 1214e1f (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.reset_password_within = 6.hours >>>>>>> 49e8a6c (Rebased)
    319. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    320. # When set to false, does not sign a user in automatically after their password is
    321. # reset. Defaults to true, so a user is signed in automatically after a reset.
    322. # config.sign_in_after_reset_password = true
    323. # ==> Configuration for :encryptable
    324. # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
    325. # You can use :sha1, :sha512 or algorithms from others authentication tools as
    326. # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
    327. # for default behavior) and :restful_authentication_sha1 (then you should set
    328. # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
    329. #
    330. # Require the `devise-encryptable` gem when using anything other than bcrypt
    331. # config.encryptor = :sha512
    332. # ==> Scopes configuration
    333. # Turn scoped views on. Before rendering "sessions/new", it will first check for
    334. # "users/sessions/new". It's turned off by default because it's slower if you
    335. # are using only default views.
    336. # config.scoped_views = false
    337. # Configure the default scope given to Warden. By default it's the first
    338. # devise role declared in your routes (usually :user).
    339. # config.default_scope = :user
    340. # Set this configuration to false if you want /users/sign_out to sign out
    341. # only the current scope. By default, Devise signs out all scopes.
    342. # config.sign_out_all_scopes = true
    343. # ==> Navigation configuration
    344. # Lists the formats that should be treated as navigational. Formats like
    345. # :html, should redirect to the sign in page when the user does not have
    346. # access, but formats like :xml or :json, should return 401.
    347. #
    348. # If you have any extra navigational formats, like :iphone or :mobile, you
    349. # should add them to the navigational formats lists.
    350. #
    351. # The "*/*" below is required to match Internet Explorer requests.
    352. # config.navigational_formats = ['*/*', :html]
    353. # The default HTTP method used to sign out a resource. Default is :delete.
    354. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    355. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    356. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    357. >>>>>>> 730a8ca (Add login registration pages) =======
    358. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    359. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 1214e1f (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.sign_out_via = :delete >>>>>>> 49e8a6c (Rebased)
    360. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    361. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    362. 1 =======
    363. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= =======
    364. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= =======
    365. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) =======
    366. 1 >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    367. >>>>>>> 730a8ca (Add login registration pages) =======
    368. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= =======
    369. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= config.omniauth :facebook, >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= config.omniauth :facebook, >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased)
    370. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # ==> OmniAuth ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased)
    371. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Add a new OmniAuth provider. Check the wiki for more information on setting ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased)
    372. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # up on your models and hooks. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= scope: 'email', info_fields: 'email,name' >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= scope: 'email', info_fields: 'email,name' >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased)
    373. # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
    374. # ==> Warden configuration
    375. # If you want to use other strategies, that are not supported by Devise, or
    376. # change the failure app, you can configure them inside the config.warden block.
    377. #
    378. # config.warden do |manager|
    379. # manager.intercept_401 = false
    380. # manager.default_strategies(scope: :user).unshift :some_external_strategy
    381. # end
    382. # ==> Mountable engine configurations
    383. # When using Devise inside an engine, let's call it `MyEngine`, and this engine
    384. # is mountable, there are some extra configurations to be taken into account.
    385. # The following options are available, assuming the engine is mounted as:
    386. #
    387. # mount MyEngine, at: '/my_engine'
    388. #
    389. # The router that invoked `devise_for`, in the example above, would be:
    390. # config.router_name = :my_engine
    391. #
    392. # When using OmniAuth, Devise cannot automatically set OmniAuth path,
    393. # so you need to do it manually. For the users scope, it would be:
    394. # config.omniauth_path_prefix = '/my_engine/users/auth'
    395. # ==> Turbolinks configuration
    396. # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
    397. #
    398. # ActiveSupport.on_load(:devise_failure_app) do
    399. # include Turbolinks::Controller
    400. # end
    401. # ==> Configuration for :registerable
    402. # When set to false, does not sign a user in automatically after their password is
    403. # changed. Defaults to true, so a user is signed in automatically after changing a password.
    404. # config.sign_in_after_change_password = true
    405. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) # Configure the parent class to the devise controllers.
    406. # config.parent_controller = 'DeviseController'
    407. # ==> Mailer Configuration
    408. # Configure the e-mail address which will be shown in Devise::Mailer,
    409. # note that it will be overwritten if you use your own mailer class
    410. # with default "from" parameter.
    411. ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ebcdce06 (Featire specs)
    412. >>>>>>> c7a726c5 (Rebased) 1 =======
    413. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    414. >>>>>>> 730a8ca (Add login registration pages) =======
    415. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 1214e1f (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' >>>>>>> 11792758 (Rebased)
    416. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages)
    417. 1 =======
    418. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    419. >>>>>>> 730a8ca (Add login registration pages) =======
    420. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    421. 1 >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 1214e1f (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= require 'devise/orm/active_record' >>>>>>> 11792758 (Rebased)
    422. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages)
    423. 1 =======
    424. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    425. >>>>>>> 730a8ca (Add login registration pages) =======
    426. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    427. 1 >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 1214e1f (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.case_insensitive_keys = [:email] >>>>>>> 11792758 (Rebased)
    428. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages)
    429. 1 =======
    430. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    431. >>>>>>> 730a8ca (Add login registration pages) =======
    432. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    433. 1 >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 1214e1f (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.strip_whitespace_keys = [:email] >>>>>>> 11792758 (Rebased)
    434. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages)
    435. 1 =======
    436. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    437. >>>>>>> 730a8ca (Add login registration pages) =======
    438. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    439. 1 >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 1214e1f (Add login registration pages) ======= # >>>>>>> 730a8ca (Add login registration pages) ======= # >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.skip_session_storage = [:http_auth] >>>>>>> 11792758 (Rebased)
    440. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages)
    441. 1 =======
    442. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    443. >>>>>>> 730a8ca (Add login registration pages) =======
    444. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    445. 1 >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 1214e1f (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.stretches = Rails.env.test? ? 1 : 12 >>>>>>> 11792758 (Rebased)
    446. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages)
    447. 1 =======
    448. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    449. >>>>>>> 730a8ca (Add login registration pages) =======
    450. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    451. 1 >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 1214e1f (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.reconfirmable = true >>>>>>> 11792758 (Rebased)
    452. 1 ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) config.expire_all_remember_me_on_sign_out = true <<<<<<< HEAD ======= Devise.setup do |config| >>>>>>> 9bfbd88 (Featire specs) ======= Devise.setup do |config| <<<<<<< HEAD ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased)
    453. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages)
    454. 1 =======
    455. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    456. >>>>>>> 730a8ca (Add login registration pages) =======
    457. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    458. 1 >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 1214e1f (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.password_length = 6..128 >>>>>>> 11792758 (Rebased)
    459. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages)
    460. 1 =======
    461. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    462. >>>>>>> 730a8ca (Add login registration pages) =======
    463. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    464. 1 >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 1214e1f (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ >>>>>>> 11792758 (Rebased)
    465. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages)
    466. 1 =======
    467. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    468. >>>>>>> 730a8ca (Add login registration pages) =======
    469. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    470. 1 >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 1214e1f (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.reset_password_within = 6.hours >>>>>>> 11792758 (Rebased)
    471. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages)
    472. 1 =======
    473. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    474. >>>>>>> 730a8ca (Add login registration pages) =======
    475. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    476. 1 >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 1214e1f (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.sign_out_via = :delete >>>>>>> 11792758 (Rebased)
    477. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages)
    478. 1 =======
    479. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    480. >>>>>>> 730a8ca (Add login registration pages) =======
    481. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    482. 1 >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.omniauth :facebook, >>>>>>> 11792758 (Rebased)
    483. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 11792758 (Rebased)
    484. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 11792758 (Rebased)
    485. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= scope: 'email', info_fields: 'email,name' >>>>>>> 11792758 (Rebased)
    486. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= # Configure the parent class to the devise controllers.
    487. # config.parent_controller = 'DeviseController'
    488. # ==> Mailer Configuration
    489. # Configure the e-mail address which will be shown in Devise::Mailer,
    490. # note that it will be overwritten if you use your own mailer class
    491. # with default "from" parameter.
    492. <<<<<<< HEAD ======= ======= ======= >>>>>>> 156ffe6 (Add login registration pages)
    493. >>>>>>> 9a49b7b (Rebased) >>>>>>> bae2b7de (Add login registration pages) 1 =======
    494. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 1214e1f (Add login registration pages)
    495. <<<<<<< HEAD
    496. # Configure the class responsible to send e-mails.
    497. # config.mailer = 'Devise::Mailer'
    498. # Configure the parent class responsible to send e-mails.
    499. # config.parent_mailer = 'ActionMailer::Base'
    500. # ==> ORM configuration
    501. # Load and configure the ORM. Supports :active_record (default) and
    502. # :mongoid (bson_ext recommended) by default. Other ORMs may be
    503. # available as additional gems.
    504. ======= <<<<<<< HEAD
    505. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    506. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 1214e1f (Add login registration pages)
    507. <<<<<<< HEAD
    508. # ==> Configuration for any authentication mechanism
    509. # Configure which keys are used when authenticating a user. The default is
    510. # just :email. You can configure it to use [:username, :subdomain], so for
    511. # authenticating a user, both parameters are required. Remember that those
    512. # parameters are used only when authenticating and not when retrieving from
    513. # session. If you need permissions, you should implement that in a before filter.
    514. # You can also supply a hash where the value is a boolean determining whether
    515. # or not authentication should be aborted when the value is not present.
    516. # config.authentication_keys = [:email]
    517. # Configure parameters from the request object used for authentication. Each entry
    518. # given should be a request method and it will automatically be passed to the
    519. # find_for_authentication method and considered in your model lookup. For instance,
    520. # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
    521. # The same considerations mentioned for authentication_keys also apply to request_keys.
    522. # config.request_keys = []
    523. # Configure which authentication keys should be case-insensitive.
    524. # These keys will be downcased upon creating or modifying a user and when used
    525. # to authenticate or find a user. Default is :email.
    526. ======= <<<<<<< HEAD
    527. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    528. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 1214e1f (Add login registration pages)
    529. <<<<<<< HEAD
    530. # Configure which authentication keys should have whitespace stripped.
    531. # These keys will have whitespace before and after removed upon creating or
    532. # modifying a user and when used to authenticate or find a user. Default is :email.
    533. ======= <<<<<<< HEAD
    534. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    535. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 1214e1f (Add login registration pages)
    536. <<<<<<< HEAD
    537. # Tell if authentication through request.params is enabled. True by default.
    538. # It can be set to an array that will enable params authentication only for the
    539. # given strategies, for example, `config.params_authenticatable = [:database]` will
    540. # enable it only for database (email + password) authentication.
    541. # config.params_authenticatable = true
    542. # Tell if authentication through HTTP Auth is enabled. False by default.
    543. # It can be set to an array that will enable http authentication only for the
    544. # given strategies, for example, `config.http_authenticatable = [:database]` will
    545. # enable it only for database authentication.
    546. # For API-only applications to support authentication "out-of-the-box", you will likely want to
    547. # enable this with :database unless you are using a custom strategy.
    548. # The supported strategies are:
    549. # :database = Support basic authentication with authentication key + password
    550. # config.http_authenticatable = false
    551. # If 401 status code should be returned for AJAX requests. True by default.
    552. # config.http_authenticatable_on_xhr = true
    553. # The realm used in Http Basic Authentication. 'Application' by default.
    554. # config.http_authentication_realm = 'Application'
    555. # It will change confirmation, password recovery and other workflows
    556. # to behave the same regardless if the e-mail provided was right or wrong.
    557. # Does not affect registerable.
    558. # config.paranoid = true
    559. # By default Devise will store the user in session. You can skip storage for
    560. # particular strategies by setting this option.
    561. # Notice that if you are skipping storage for all authentication paths, you
    562. # may want to disable generating routes to Devise's sessions controller by
    563. # passing skip: :sessions to `devise_for` in your config/routes.rb
    564. ======= <<<<<<< HEAD
    565. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    566. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 1214e1f (Add login registration pages)
    567. <<<<<<< HEAD
    568. # By default, Devise cleans up the CSRF token on authentication to
    569. # avoid CSRF token fixation attacks. This means that, when using AJAX
    570. # requests for sign in and sign up, you need to get a new CSRF token
    571. # from the server. You can disable this option at your own risk.
    572. # config.clean_up_csrf_token_on_authentication = true
    573. # When false, Devise will not attempt to reload routes on eager load.
    574. # This can reduce the time taken to boot the app but if your application
    575. # requires the Devise mappings to be loaded during boot time the application
    576. # won't boot properly.
    577. # config.reload_routes = true
    578. # ==> Configuration for :database_authenticatable
    579. # For bcrypt, this is the cost for hashing the password and defaults to 12. If
    580. # using other algorithms, it sets how many times you want the password to be hashed.
    581. # The number of stretches used for generating the hashed password are stored
    582. # with the hashed password. This allows you to change the stretches without
    583. # invalidating existing passwords.
    584. #
    585. # Limiting the stretches to just one in testing will increase the performance of
    586. # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
    587. # a value less than 10 in other environments. Note that, for bcrypt (the default
    588. # algorithm), the cost increases exponentially with the number of stretches (e.g.
    589. # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
    590. ======= <<<<<<< HEAD
    591. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    592. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 1214e1f (Add login registration pages)
    593. <<<<<<< HEAD
    594. # Set up a pepper to generate the hashed password.
    595. # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
    596. # Send a notification to the original email when the user's email is changed.
    597. # config.send_email_changed_notification = false
    598. # Send a notification email when the user's password is changed.
    599. # config.send_password_change_notification = false
    600. # ==> Configuration for :confirmable
    601. # A period that the user is allowed to access the website even without
    602. # confirming their account. For instance, if set to 2.days, the user will be
    603. # able to access the website for two days without confirming their account,
    604. # access will be blocked just in the third day.
    605. # You can also set it to nil, which will allow the user to access the website
    606. # without confirming their account.
    607. # Default is 0.days, meaning the user cannot access the website without
    608. # confirming their account.
    609. # config.allow_unconfirmed_access_for = 2.days
    610. # A period that the user is allowed to confirm their account before their
    611. # token becomes invalid. For example, if set to 3.days, the user can confirm
    612. # their account within 3 days after the mail was sent, but on the fourth day
    613. # their account can't be confirmed with the token any more.
    614. # Default is nil, meaning there is no restriction on how long a user can take
    615. # before confirming their account.
    616. # config.confirm_within = 3.days
    617. # If true, requires any email changes to be confirmed (exactly the same way as
    618. # initial account confirmation) to be applied. Requires additional unconfirmed_email
    619. # db field (see migrations). Until confirmed, new email is stored in
    620. # unconfirmed_email column, and copied to email column on successful confirmation.
    621. ======= <<<<<<< HEAD
    622. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    623. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 1214e1f (Add login registration pages)
    624. # Defines which key will be used when confirming an account
    625. # config.confirmation_keys = [:email]
    626. # ==> Configuration for :rememberable
    627. # The time the user will be remembered without asking for credentials again.
    628. # config.remember_for = 2.weeks
    629. # Invalidates all the remember me tokens when the user signs out.
    630. 1 <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 1214e1f (Add login registration pages)
    631. <<<<<<< HEAD
    632. # If true, extends the user's remember period when remembered via cookie.
    633. # config.extend_remember_period = false
    634. # Options to be passed to the created cookie. For instance, you can set
    635. # secure: true in order to force SSL only cookies.
    636. # config.rememberable_options = {}
    637. # ==> Configuration for :validatable
    638. # Range for password length.
    639. ======= <<<<<<< HEAD
    640. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    641. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 1214e1f (Add login registration pages)
    642. <<<<<<< HEAD
    643. # Email regex used to validate email formats. It simply asserts that
    644. # one (and only one) @ exists in the given string. This is mainly
    645. # to give user feedback and not to assert the e-mail validity.
    646. ======= <<<<<<< HEAD
    647. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    648. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 1214e1f (Add login registration pages)
    649. <<<<<<< HEAD
    650. # ==> Configuration for :timeoutable
    651. # The time you want to timeout the user session without activity. After this
    652. # time the user will be asked for credentials again. Default is 30 minutes.
    653. # config.timeout_in = 30.minutes
    654. # ==> Configuration for :lockable
    655. # Defines which strategy will be used to lock an account.
    656. # :failed_attempts = Locks an account after a number of failed attempts to sign in.
    657. # :none = No lock strategy. You should handle locking by yourself.
    658. # config.lock_strategy = :failed_attempts
    659. # Defines which key will be used when locking and unlocking an account
    660. # config.unlock_keys = [:email]
    661. # Defines which strategy will be used to unlock an account.
    662. # :email = Sends an unlock link to the user email
    663. # :time = Re-enables login after a certain amount of time (see :unlock_in below)
    664. # :both = Enables both strategies
    665. # :none = No unlock strategy. You should handle unlocking by yourself.
    666. # config.unlock_strategy = :both
    667. # Number of authentication tries before locking an account if lock_strategy
    668. # is failed attempts.
    669. # config.maximum_attempts = 20
    670. # Time interval to unlock the account if :time is enabled as unlock_strategy.
    671. # config.unlock_in = 1.hour
    672. # Warn on the last attempt before the account is locked.
    673. # config.last_attempt_warning = true
    674. # ==> Configuration for :recoverable
    675. #
    676. # Defines which key will be used when recovering the password for an account
    677. # config.reset_password_keys = [:email]
    678. # Time interval you can reset your password with a reset password key.
    679. # Don't put a too small interval or your users won't have the time to
    680. # change their passwords.
    681. ======= <<<<<<< HEAD
    682. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    683. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 1214e1f (Add login registration pages)
    684. <<<<<<< HEAD
    685. # When set to false, does not sign a user in automatically after their password is
    686. # reset. Defaults to true, so a user is signed in automatically after a reset.
    687. # config.sign_in_after_reset_password = true
    688. # ==> Configuration for :encryptable
    689. # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
    690. # You can use :sha1, :sha512 or algorithms from others authentication tools as
    691. # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
    692. # for default behavior) and :restful_authentication_sha1 (then you should set
    693. # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
    694. #
    695. # Require the `devise-encryptable` gem when using anything other than bcrypt
    696. # config.encryptor = :sha512
    697. # ==> Scopes configuration
    698. # Turn scoped views on. Before rendering "sessions/new", it will first check for
    699. # "users/sessions/new". It's turned off by default because it's slower if you
    700. # are using only default views.
    701. # config.scoped_views = false
    702. # Configure the default scope given to Warden. By default it's the first
    703. # devise role declared in your routes (usually :user).
    704. # config.default_scope = :user
    705. # Set this configuration to false if you want /users/sign_out to sign out
    706. # only the current scope. By default, Devise signs out all scopes.
    707. # config.sign_out_all_scopes = true
    708. # ==> Navigation configuration
    709. # Lists the formats that should be treated as navigational. Formats like
    710. # :html, should redirect to the sign in page when the user does not have
    711. # access, but formats like :xml or :json, should return 401.
    712. #
    713. # If you have any extra navigational formats, like :iphone or :mobile, you
    714. # should add them to the navigational formats lists.
    715. #
    716. # The "*/*" below is required to match Internet Explorer requests.
    717. # config.navigational_formats = ['*/*', :html]
    718. # The default HTTP method used to sign out a resource. Default is :delete.
    719. ======= <<<<<<< HEAD
    720. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    721. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 1214e1f (Add login registration pages)
    722. <<<<<<< HEAD
    723. ======= <<<<<<< HEAD
    724. 1 =======
    725. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages)
    726. <<<<<<< HEAD # ==> OmniAuth ======= <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages)
    727. <<<<<<< HEAD # Add a new OmniAuth provider. Check the wiki for more information on setting ======= <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages)
    728. <<<<<<< HEAD # up on your models and hooks. ======= <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages)
    729. # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
    730. # ==> Warden configuration
    731. # If you want to use other strategies, that are not supported by Devise, or
    732. # change the failure app, you can configure them inside the config.warden block.
    733. #
    734. # config.warden do |manager|
    735. # manager.intercept_401 = false
    736. # manager.default_strategies(scope: :user).unshift :some_external_strategy
    737. # end
    738. # ==> Mountable engine configurations
    739. # When using Devise inside an engine, let's call it `MyEngine`, and this engine
    740. # is mountable, there are some extra configurations to be taken into account.
    741. # The following options are available, assuming the engine is mounted as:
    742. #
    743. # mount MyEngine, at: '/my_engine'
    744. #
    745. # The router that invoked `devise_for`, in the example above, would be:
    746. # config.router_name = :my_engine
    747. #
    748. # When using OmniAuth, Devise cannot automatically set OmniAuth path,
    749. # so you need to do it manually. For the users scope, it would be:
    750. # config.omniauth_path_prefix = '/my_engine/users/auth'
    751. # ==> Turbolinks configuration
    752. # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
    753. #
    754. # ActiveSupport.on_load(:devise_failure_app) do
    755. # include Turbolinks::Controller
    756. # end
    757. # ==> Configuration for :registerable
    758. # When set to false, does not sign a user in automatically after their password is
    759. # changed. Defaults to true, so a user is signed in automatically after changing a password.
    760. # config.sign_in_after_change_password = true
    761. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) # Configure the parent class to the devise controllers.
    762. # config.parent_controller = 'DeviseController'
    763. # ==> Mailer Configuration
    764. # Configure the e-mail address which will be shown in Devise::Mailer,
    765. # note that it will be overwritten if you use your own mailer class
    766. # with default "from" parameter.
    767. 1 config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
    768. # Configure the class responsible to send e-mails.
    769. # config.mailer = 'Devise::Mailer'
    770. # Configure the parent class responsible to send e-mails.
    771. # config.parent_mailer = 'ActionMailer::Base'
    772. # ==> ORM configuration
    773. # Load and configure the ORM. Supports :active_record (default) and
    774. # :mongoid (bson_ext recommended) by default. Other ORMs may be
    775. # available as additional gems.
    776. 1 require 'devise/orm/active_record'
    777. # ==> Configuration for any authentication mechanism
    778. # Configure which keys are used when authenticating a user. The default is
    779. # just :email. You can configure it to use [:username, :subdomain], so for
    780. # authenticating a user, both parameters are required. Remember that those
    781. # parameters are used only when authenticating and not when retrieving from
    782. # session. If you need permissions, you should implement that in a before filter.
    783. # You can also supply a hash where the value is a boolean determining whether
    784. # or not authentication should be aborted when the value is not present.
    785. # config.authentication_keys = [:email]
    786. # Configure parameters from the request object used for authentication. Each entry
    787. # given should be a request method and it will automatically be passed to the
    788. # find_for_authentication method and considered in your model lookup. For instance,
    789. # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
    790. # The same considerations mentioned for authentication_keys also apply to request_keys.
    791. # config.request_keys = []
    792. # Configure which authentication keys should be case-insensitive.
    793. # These keys will be downcased upon creating or modifying a user and when used
    794. # to authenticate or find a user. Default is :email.
    795. 1 config.case_insensitive_keys = [:email]
    796. # Configure which authentication keys should have whitespace stripped.
    797. # These keys will have whitespace before and after removed upon creating or
    798. # modifying a user and when used to authenticate or find a user. Default is :email.
    799. 1 config.strip_whitespace_keys = [:email]
    800. # Tell if authentication through request.params is enabled. True by default.
    801. # It can be set to an array that will enable params authentication only for the
    802. # given strategies, for example, `config.params_authenticatable = [:database]` will
    803. # enable it only for database (email + password) authentication.
    804. # config.params_authenticatable = true
    805. # Tell if authentication through HTTP Auth is enabled. False by default.
    806. # It can be set to an array that will enable http authentication only for the
    807. # given strategies, for example, `config.http_authenticatable = [:database]` will
    808. # enable it only for database authentication.
    809. # For API-only applications to support authentication "out-of-the-box", you will likely want to
    810. # enable this with :database unless you are using a custom strategy.
    811. # The supported strategies are:
    812. # :database = Support basic authentication with authentication key + password
    813. # config.http_authenticatable = false
    814. # If 401 status code should be returned for AJAX requests. True by default.
    815. # config.http_authenticatable_on_xhr = true
    816. # The realm used in Http Basic Authentication. 'Application' by default.
    817. # config.http_authentication_realm = 'Application'
    818. # It will change confirmation, password recovery and other workflows
    819. # to behave the same regardless if the e-mail provided was right or wrong.
    820. # Does not affect registerable.
    821. # config.paranoid = true
    822. # By default Devise will store the user in session. You can skip storage for
    823. # particular strategies by setting this option.
    824. # Notice that if you are skipping storage for all authentication paths, you
    825. # may want to disable generating routes to Devise's sessions controller by
    826. # passing skip: :sessions to `devise_for` in your config/routes.rb
    827. 1 config.skip_session_storage = [:http_auth]
    828. # By default, Devise cleans up the CSRF token on authentication to
    829. # avoid CSRF token fixation attacks. This means that, when using AJAX
    830. # requests for sign in and sign up, you need to get a new CSRF token
    831. # from the server. You can disable this option at your own risk.
    832. # config.clean_up_csrf_token_on_authentication = true
    833. # When false, Devise will not attempt to reload routes on eager load.
    834. # This can reduce the time taken to boot the app but if your application
    835. # requires the Devise mappings to be loaded during boot time the application
    836. # won't boot properly.
    837. # config.reload_routes = true
    838. # ==> Configuration for :database_authenticatable
    839. # For bcrypt, this is the cost for hashing the password and defaults to 12. If
    840. # using other algorithms, it sets how many times you want the password to be hashed.
    841. # The number of stretches used for generating the hashed password are stored
    842. # with the hashed password. This allows you to change the stretches without
    843. # invalidating existing passwords.
    844. #
    845. # Limiting the stretches to just one in testing will increase the performance of
    846. # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
    847. # a value less than 10 in other environments. Note that, for bcrypt (the default
    848. # algorithm), the cost increases exponentially with the number of stretches (e.g.
    849. # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
    850. 1 config.stretches = Rails.env.test? ? 1 : 12
    851. # Set up a pepper to generate the hashed password.
    852. # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
    853. # Send a notification to the original email when the user's email is changed.
    854. # config.send_email_changed_notification = false
    855. # Send a notification email when the user's password is changed.
    856. # config.send_password_change_notification = false
    857. # ==> Configuration for :confirmable
    858. # A period that the user is allowed to access the website even without
    859. # confirming their account. For instance, if set to 2.days, the user will be
    860. # able to access the website for two days without confirming their account,
    861. # access will be blocked just in the third day.
    862. # You can also set it to nil, which will allow the user to access the website
    863. # without confirming their account.
    864. # Default is 0.days, meaning the user cannot access the website without
    865. # confirming their account.
    866. # config.allow_unconfirmed_access_for = 2.days
    867. # A period that the user is allowed to confirm their account before their
    868. # token becomes invalid. For example, if set to 3.days, the user can confirm
    869. # their account within 3 days after the mail was sent, but on the fourth day
    870. # their account can't be confirmed with the token any more.
    871. # Default is nil, meaning there is no restriction on how long a user can take
    872. # before confirming their account.
    873. # config.confirm_within = 3.days
    874. # If true, requires any email changes to be confirmed (exactly the same way as
    875. # initial account confirmation) to be applied. Requires additional unconfirmed_email
    876. # db field (see migrations). Until confirmed, new email is stored in
    877. # unconfirmed_email column, and copied to email column on successful confirmation.
    878. 1 config.reconfirmable = true
    879. # Defines which key will be used when confirming an account
    880. # config.confirmation_keys = [:email]
    881. # ==> Configuration for :rememberable
    882. # The time the user will be remembered without asking for credentials again.
    883. # config.remember_for = 2.weeks
    884. # Invalidates all the remember me tokens when the user signs out.
    885. 1 config.expire_all_remember_me_on_sign_out = true
    886. # If true, extends the user's remember period when remembered via cookie.
    887. # config.extend_remember_period = false
    888. # Options to be passed to the created cookie. For instance, you can set
    889. # secure: true in order to force SSL only cookies.
    890. # config.rememberable_options = {}
    891. # ==> Configuration for :validatable
    892. # Range for password length.
    893. 1 config.password_length = 6..128
    894. # Email regex used to validate email formats. It simply asserts that
    895. # one (and only one) @ exists in the given string. This is mainly
    896. # to give user feedback and not to assert the e-mail validity.
    897. 1 config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
    898. # ==> Configuration for :timeoutable
    899. # The time you want to timeout the user session without activity. After this
    900. # time the user will be asked for credentials again. Default is 30 minutes.
    901. # config.timeout_in = 30.minutes
    902. # ==> Configuration for :lockable
    903. # Defines which strategy will be used to lock an account.
    904. # :failed_attempts = Locks an account after a number of failed attempts to sign in.
    905. # :none = No lock strategy. You should handle locking by yourself.
    906. # config.lock_strategy = :failed_attempts
    907. # Defines which key will be used when locking and unlocking an account
    908. # config.unlock_keys = [:email]
    909. # Defines which strategy will be used to unlock an account.
    910. # :email = Sends an unlock link to the user email
    911. # :time = Re-enables login after a certain amount of time (see :unlock_in below)
    912. # :both = Enables both strategies
    913. # :none = No unlock strategy. You should handle unlocking by yourself.
    914. # config.unlock_strategy = :both
    915. # Number of authentication tries before locking an account if lock_strategy
    916. # is failed attempts.
    917. # config.maximum_attempts = 20
    918. # Time interval to unlock the account if :time is enabled as unlock_strategy.
    919. # config.unlock_in = 1.hour
    920. # Warn on the last attempt before the account is locked.
    921. # config.last_attempt_warning = true
    922. # ==> Configuration for :recoverable
    923. #
    924. # Defines which key will be used when recovering the password for an account
    925. # config.reset_password_keys = [:email]
    926. # Time interval you can reset your password with a reset password key.
    927. # Don't put a too small interval or your users won't have the time to
    928. # change their passwords.
    929. 1 config.reset_password_within = 6.hours
    930. # When set to false, does not sign a user in automatically after their password is
    931. # reset. Defaults to true, so a user is signed in automatically after a reset.
    932. # config.sign_in_after_reset_password = true
    933. # ==> Configuration for :encryptable
    934. # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
    935. # You can use :sha1, :sha512 or algorithms from others authentication tools as
    936. # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
    937. # for default behavior) and :restful_authentication_sha1 (then you should set
    938. # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
    939. #
    940. # Require the `devise-encryptable` gem when using anything other than bcrypt
    941. # config.encryptor = :sha512
    942. # ==> Scopes configuration
    943. # Turn scoped views on. Before rendering "sessions/new", it will first check for
    944. # "users/sessions/new". It's turned off by default because it's slower if you
    945. # are using only default views.
    946. # config.scoped_views = false
    947. # Configure the default scope given to Warden. By default it's the first
    948. # devise role declared in your routes (usually :user).
    949. # config.default_scope = :user
    950. # Set this configuration to false if you want /users/sign_out to sign out
    951. # only the current scope. By default, Devise signs out all scopes.
    952. # config.sign_out_all_scopes = true
    953. # ==> Navigation configuration
    954. # Lists the formats that should be treated as navigational. Formats like
    955. # :html, should redirect to the sign in page when the user does not have
    956. # access, but formats like :xml or :json, should return 401.
    957. #
    958. # If you have any extra navigational formats, like :iphone or :mobile, you
    959. # should add them to the navigational formats lists.
    960. #
    961. # The "*/*" below is required to match Internet Explorer requests.
    962. # config.navigational_formats = ['*/*', :html]
    963. # The default HTTP method used to sign out a resource. Default is :delete.
    964. 1 config.sign_out_via = :delete
    965. # ==> OmniAuth
    966. # Add a new OmniAuth provider. Check the wiki for more information on setting
    967. # up on your models and hooks.
    968. # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
    969. # ==> Warden configuration
    970. # If you want to use other strategies, that are not supported by Devise, or
    971. # change the failure app, you can configure them inside the config.warden block.
    972. #
    973. # config.warden do |manager|
    974. # manager.intercept_401 = false
    975. # manager.default_strategies(scope: :user).unshift :some_external_strategy
    976. # end
    977. # ==> Mountable engine configurations
    978. # When using Devise inside an engine, let's call it `MyEngine`, and this engine
    979. # is mountable, there are some extra configurations to be taken into account.
    980. # The following options are available, assuming the engine is mounted as:
    981. #
    982. # mount MyEngine, at: '/my_engine'
    983. #
    984. # The router that invoked `devise_for`, in the example above, would be:
    985. # config.router_name = :my_engine
    986. #
    987. # When using OmniAuth, Devise cannot automatically set OmniAuth path,
    988. # so you need to do it manually. For the users scope, it would be:
    989. # config.omniauth_path_prefix = '/my_engine/users/auth'
    990. # ==> Turbolinks configuration
    991. # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
    992. #
    993. # ActiveSupport.on_load(:devise_failure_app) do
    994. # include Turbolinks::Controller
    995. # end
    996. # ==> Configuration for :registerable
    997. # When set to false, does not sign a user in automatically after their password is
    998. # changed. Defaults to true, so a user is signed in automatically after changing a password.
    999. # config.sign_in_after_change_password = true
    1000. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    config/initializers/filter_parameter_logging.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Configure sensitive parameters which will be filtered from the log file.
    3. 1 Rails.application.config.filter_parameters += %i[
    4. passw secret token _key crypt salt certificate otp ssn
    5. ]

    config/initializers/inflections.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Add new inflection rules using the following format. Inflections
    3. # are locale specific, and you may define rules for as many different
    4. # locales as you wish. All of these examples are active by default:
    5. # ActiveSupport::Inflector.inflections(:en) do |inflect|
    6. # inflect.plural /^(ox)$/i, '\1en'
    7. # inflect.singular /^(ox)en/i, '\1'
    8. # inflect.irregular 'person', 'people'
    9. # inflect.uncountable %w( fish sheep )
    10. # end
    11. # These inflection rules are supported but not enabled by default:
    12. # ActiveSupport::Inflector.inflections(:en) do |inflect|
    13. # inflect.acronym 'RESTful'
    14. # end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    config/initializers/kaminari.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 Kaminari.configure do |config|
    2. 1 config.page_method_name = :per_page_kaminari
    3. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    config/initializers/mime_types.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Add new mime types for use in respond_to blocks:
    3. # Mime::Type.register "text/richtext", :rtf
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
    ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3723aad (Featire specs)
    >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD =======
    >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 9c0d812 (Featire specs)
    >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD
    >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true)
    >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased)
    >>>>>>> 56fd9d41 (Add login registration pages) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs)
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
    >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix)
    >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> ebcdce06 (Featire specs)
    =======
    >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs)
    >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)

    config/initializers/money.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 Money.locale_backend = :i18n
    2. 1 Money.rounding_mode = BigDecimal::ROUND_HALF_EVEN
    3. 1 Money.default_currency = Money::Currency.new('EUR')
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)

    config/initializers/omniauth.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) 3 relevant lines. 3 lines covered and ======= 2 relevant lines. 2 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 11792758 (Rebased) ======= 3 relevant lines. 3 lines covered and >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 3 relevant lines. 3 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) OmniAuth.config.logger = Rails.logger
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) Rails.application.config.middleware.use OmniAuth::Builder do
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs)
    4. =======
    5. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    6. >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages)
    7. =======
    8. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= =======
    9. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
    10. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= =======
    11. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= =======
    12. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased)
    13. =======
    14. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages)
    15. =======
    16. >>>>>>> 1214e1f (Add login registration pages) =======
    17. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======
    18. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= =======
    19. >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
    20. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    21. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= =======
    22. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= =======
    23. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    24. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
    25. >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= =======
    26. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= provider :facebook, >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= provider :facebook, >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= provider :facebook, >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= provider :facebook, >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= provider :facebook, >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= provider :facebook, >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= provider :facebook, >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= provider :facebook, >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    27. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    28. Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
    29. Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
    30. <<<<<<< HEAD scope: 'public_profile, email', info_fields: 'email, first_name, last_name' ======= scope: 'email', info_fields: 'email,name' >>>>>>> c7a726c5 (Rebased)
    31. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    32. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) =======
    33. >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= =======
    34. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= =======
    35. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
    36. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) =======
    37. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= =======
    38. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) =======
    39. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======
    40. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= =======
    41. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
    42. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    43. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= =======
    44. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= =======
    45. >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    config/initializers/permissions_policy.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Define an application-wide HTTP permissions policy. For further
    2. # information see https://developers.google.com/web/updates/2018/06/feature-policy
    3. #
    4. # Rails.application.config.permissions_policy do |f|
    5. # f.camera :none
    6. # f.gyroscope :none
    7. # f.microphone :none
    8. # f.usb :none
    9. # f.fullscreen :self
    10. # f.payment :self, "https://secure.example.com"
    11. # end

    config/initializers/wrap_parameters.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # This file contains settings for ActionController::ParamsWrapper which
    3. # is enabled by default.
    4. # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
    5. 1 ActiveSupport.on_load(:action_controller) do
    6. 2 wrap_parameters format: [:json]
    7. end
    8. # To enable root element in JSON for ActiveRecord objects.
    9. # ActiveSupport.on_load(:active_record) do
    10. # self.include_root_in_json = true
    11. # end

    config/routes.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 4 relevant lines. 4 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) 3 relevant lines. 3 lines covered and ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 3 relevant lines. 3 lines covered and ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= 3 relevant lines. 3 lines covered and ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) 4 relevant lines. 4 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 9 relevant lines. 9 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9620751 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 17 relevant lines. 17 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 0 lines missed.
        
    1. 1 require 'sidekiq/web'
    2. <<<<<<< HEAD
    3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) root 'home#index' ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) devise_for :users ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) root 'home#index' ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) root 'home#index' ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= root 'home#index' ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= root 'home#index' ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) devise_for :users ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) ======= devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 9d98d9ab (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    4. =======
    5. >>>>>>> 7c4ea7f (Fix)
    6. 1 Rails.application.routes.draw do
    7. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) root 'home#index' ======= ActiveAdmin.routes(self) >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> d8abfed3 (Featire specs) root 'home#index' <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ActiveAdmin.routes(self) ======= ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ActiveAdmin.routes(self) ======= resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= resources :books, only: %i[show index] >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ActiveAdmin.routes(self) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= resources :books, only: %i[show index] ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= resources :books, only: %i[show index] >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= root 'home#index' >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= <<<<<<< HEAD root 'home#index' >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ActiveAdmin.routes(self) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs)
    8. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased)
    9. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD authenticate :admin_user do ======= ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) resources :books, only: %i[show index] >>>>>>> c7a726c5 (Rebased)
    10. <<<<<<< HEAD <<<<<<< HEAD =======
    11. ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs)
    12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price)
    13. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    14. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
    ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    =======

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) } ======= ======= <<<<<<< HEAD resources :books, only: %i[show index] >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) resources :books, only: %i[show index]
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs)
    5. ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs)
    6. =======
    7. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    8. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) } >>>>>>> 84003439 (Featire specs)
    4. <<<<<<< HEAD
    5. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') } ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 84003439 (Featire specs) devise_for :users >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD resources :books, only: %i[show index] >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= devise_for :users >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    6. <<<<<<< HEAD
    7. 1 devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
    8. 1 <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) root 'home#index'
    9. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs)
    10. 1 resources :users
    11. 1 resources :books, only: %i[show index] do
    12. 1 resources :reviews, only: :create
    13. end
    14. ======= >>>>>>> bae2b7de (Add login registration pages) end
    <<<<<<< HEAD <<<<<<< HEAD
    >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

    spec/decorators/author_decorator_spec.rb

    ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    =======

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) }
    4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
    5. 1 context 'when decorate' do
    6. 1 it '#full_name' do
    7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
    8. end
    9. end
    10. end
    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

    spec/decorators/author_decorator_spec.rb

    ======= =======

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) }
    4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
    5. 1 context 'when decorate' do
    6. 1 it '#full_name' do
    7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
    8. end
    9. end
    10. ======= >>>>>>> 7a02bbe (Featire specs) end
    <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } ======= let(:book_decorator) { described_class.new(book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
    4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    5. <<<<<<< HEAD
    6. 2 ======= ======= >>>>>>> 5b7749a (Fix)
    7. 1 mount Sidekiq::Web => '/sidekiq'
    8. end
    9. 1 ActiveAdmin.routes(self)
    10. <<<<<<< HEAD end
    11. end
    12. <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) end
    <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true) =======

    spec/decorators/author_decorator_spec.rb

    >>>>>>> c7a726c5 (Rebased)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. ======= >>>>>>> 5b7749a (Fix)
    3. <<<<<<< HEAD
    4. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
    5. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs)
    6. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    8. =======
    9. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD resources :books, only: %i[show index]
    10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) end
    >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD root 'home#index' >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    =======

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) }
    4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
    5. 1 context 'when decorate' do
    6. 1 it '#full_name' do
    7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
    8. end
    9. end
    10. ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) end
    <<<<<<< HEAD
    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    >>>>>>> 610b6138 (Featire specs)

    spec/decorators/author_decorator_spec.rb

    =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true)
    4. <<<<<<< HEAD
    5. =======
    6. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
    7. 1 context 'when decorate' do
    8. 1 it '#full_name' do
    9. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
    10. end
    11. end
    12. ======= >>>>>>> 7a02bbe (Featire specs) end
    <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. >>>>>>> e5752db (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD resources :books, only: %i[show index]
    3. <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
    =======

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) }
    4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
    5. 1 context 'when decorate' do
    6. 1 it '#full_name' do
    7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
    8. end
    9. end
    10. end
    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

    spec/decorators/author_decorator_spec.rb

    =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) RSpec.describe AuthorDecorator do
    3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
    4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    5. 1 <<<<<<< HEAD ======= context 'when decorate' do
    6. 1 it '#full_name' do
    7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
    8. end
    9. end
    10. ======= >>>>>>> 7a02bbe (Featire specs) end
    <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 5 relevant lines. 5 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
        
    1. 1 RSpec.describe AuthorDecorator, type: :decorator do
    2. <<<<<<< HEAD
    3. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
    4. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    5. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    6. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) resources :books, only: %i[show index]
    7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs)
    8. ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    9. ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======
    10. ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    11. =======
    12. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    13. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) }
    4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') } ======= <<<<<<< HEAD ======= ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD =======
    5. 1 devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
    6. 1 <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) devise_for :users >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD
    7. =======
    8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
    9. 1 resources :users >>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
    10. <<<<<<< HEAD
    11. 1 =======
    12. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
    13. <<<<<<< HEAD
    14. ======= <<<<<<< HEAD
    15. >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) 1 =======
    16. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 11792758 (Rebased) root 'home#index'
    17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased)
    18. 1 resources :users
    19. 1 resources :books, only: %i[show index] do
    20. 1 <<<<<<< HEAD =======
    21. ======= ======= >>>>>>> 5b7749a (Fix)
    22. ======= >>>>>>> 11792758 (Rebased)
    23. <<<<<<< HEAD
    24. 1 resources :orders, only: %i[index] do
    25. 1 get '/add_to_order', to: 'order_books#add_to_order'
    26. 1 delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
    27. 1 put '/order_update_book', to: 'order_books#update_quantity'
    28. =======
    29. >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    30. >>>>>>> 11792758 (Rebased) end
    31. <<<<<<< HEAD <<<<<<< HEAD
    32. 1 get '/coupon_check', to: 'coupons#find'
    33. 1 resources :users
    34. 1 resources :books, only: %i[show index] do
    35. 1 resources :reviews, only: :create
    36. end
    37. =======
    38. >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    39. >>>>>>> 11792758 (Rebased) end
    <<<<<<< HEAD
    ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

    spec/decorators/author_decorator_spec.rb

    <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d9d85ca6 (Fix) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> 02a399d (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> 183b6c5 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) =======

    spec/decorators/author_decorator_spec.rb

    >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD
    >>>>>>> c033601 (Rebased)

    spec/decorators/author_decorator_spec.rb

    <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> 02a399d (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> 183b6c5 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> fd6db03 (Manifest_cache true) =======

    spec/decorators/author_decorator_spec.rb

    >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs)

    spec/decorators/author_decorator_spec.rb

    ======= >>>>>>> b15044a (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= ======= =======
    >>>>>>> c033601 (Rebased)

    spec/decorators/author_decorator_spec.rb

    >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) 5 relevant lines. 5 lines covered and <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 12 relevant lines. 12 lines covered and ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= ======= >>>>>>> b15044a (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> 2c640cf (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) 5 relevant lines. 5 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> 845dac1 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) >>>>>>> 31d15e66 (Fix) ======= ======= 5 relevant lines. 5 lines covered and <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD RSpec.describe AuthorDecorator, type: :decorator do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator, type: :decorator do ======= ======= RSpec.describe AuthorDecorator, type: :decorator do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) RSpec.describe AuthorDecorator, type: :decorator do ======= >>>>>>> c8da2e3 (Fix) require 'rails_helper' >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) RSpec.describe AuthorDecorator, type: :decorator do ======= require 'rails_helper' >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) ======= require 'rails_helper' >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= require 'rails_helper' >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    2. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    3. 2 subject(:decorated_object) { described_class.new(author) }
    4. <<<<<<< HEAD ======= ======= ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD
    5. >>>>>>> 9a49b7b (Rebased) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true)
    6. 2 >>>>>>> 24b58e6 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)
    7. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
    8. ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
    9. 2 >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
    10. 2 >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
    11. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    13. 2 ======= ======= >>>>>>> 5b7749a (Fix)
    14. 1 >>>>>>> 824bb2b (Featire specs) =======
    15. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
    16. 1 >>>>>>> e3e66f3 (Featire specs) =======
    17. 2 =======
    18. 1 >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) let(:author) { create(:author) } ======= RSpec.describe BookDecorator do >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= RSpec.describe BookDecorator do >>>>>>> 0d6dd12 (Manifest_cache true) ======= RSpec.describe BookDecorator do >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    19. <<<<<<< HEAD <<<<<<< HEAD
    20. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    21. ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    22. 3 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) subject(:book_decorator) { described_class.new(book) } ======= <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> bd8bda4 (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> aa7b40c (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 183b6c5 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    23. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    24. ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
    25. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    26. <<<<<<< HEAD =======
    27. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    28. >>>>>>> bd8bda4 (Manifest_cache true) =======
    29. >>>>>>> aa7b40c (Manifest_cache true) =======
    30. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    31. >>>>>>> 02a399d (Manifest_cache true) =======
    32. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    33. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    34. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
    35. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    36. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    37. <<<<<<< HEAD <<<<<<< HEAD
    38. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD
    39. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    40. ======= <<<<<<< HEAD
    41. =======
    42. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    43. >>>>>>> bd8bda4 (Manifest_cache true) =======
    44. >>>>>>> aa7b40c (Manifest_cache true) =======
    45. >>>>>>> 183b6c5 (Manifest_cache true) =======
    46. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) describe '#full_name' do ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= let(:authors) do >>>>>>> 0d6dd12 (Manifest_cache true) ======= let(:authors) do >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    47. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs)
    48. 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
    49. <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    50. ======= <<<<<<< HEAD
    51. =======
    52. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    53. >>>>>>> bd8bda4 (Manifest_cache true) =======
    54. >>>>>>> aa7b40c (Manifest_cache true) =======
    55. >>>>>>> 183b6c5 (Manifest_cache true) =======
    56. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) end ======= [ >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= [ >>>>>>> 0d6dd12 (Manifest_cache true) ======= [ >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    57. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD
    58. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs)
    59. <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    60. ======= <<<<<<< HEAD
    61. =======
    62. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    63. >>>>>>> bd8bda4 (Manifest_cache true) =======
    64. >>>>>>> aa7b40c (Manifest_cache true) =======
    65. >>>>>>> 183b6c5 (Manifest_cache true) =======
    66. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true)
    67. >>>>>>> c033601 (Rebased) 2 =======
    68. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) =======
    69. >>>>>>> c033601 (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= =======
    70. 2 >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) subject(:decorated_object) { described_class.new(author) }
    71. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    72. ======= <<<<<<< HEAD
    73. =======
    74. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    75. >>>>>>> bd8bda4 (Manifest_cache true) =======
    76. >>>>>>> aa7b40c (Manifest_cache true) =======
    77. >>>>>>> 183b6c5 (Manifest_cache true) =======
    78. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    79. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= =======
    80. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) =======
    81. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    82. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    83. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    84. ======= <<<<<<< HEAD
    85. =======
    86. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    87. >>>>>>> bd8bda4 (Manifest_cache true) =======
    88. >>>>>>> aa7b40c (Manifest_cache true) =======
    89. >>>>>>> 183b6c5 (Manifest_cache true) =======
    90. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
    91. >>>>>>> bd8bda4 (Manifest_cache true) =======
    92. >>>>>>> aa7b40c (Manifest_cache true) =======
    93. >>>>>>> 183b6c5 (Manifest_cache true) =======
    94. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) end
    95. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    96. ======= <<<<<<< HEAD
    97. =======
    98. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    99. >>>>>>> bd8bda4 (Manifest_cache true) =======
    100. >>>>>>> aa7b40c (Manifest_cache true) =======
    101. >>>>>>> 183b6c5 (Manifest_cache true) =======
    102. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 1 let(:categories) do
    103. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    104. ======= <<<<<<< HEAD
    105. =======
    106. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    107. >>>>>>> bd8bda4 (Manifest_cache true) =======
    108. >>>>>>> aa7b40c (Manifest_cache true) =======
    109. >>>>>>> 183b6c5 (Manifest_cache true) =======
    110. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) [
    111. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    112. ======= <<<<<<< HEAD
    113. =======
    114. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    115. >>>>>>> bd8bda4 (Manifest_cache true) =======
    116. >>>>>>> aa7b40c (Manifest_cache true) =======
    117. >>>>>>> 183b6c5 (Manifest_cache true) =======
    118. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 84003439 (Featire specs)
    119. 2 =======
    120. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    121. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
    122. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
    123. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
    124. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
    125. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    126. >>>>>>> c033601 (Rebased) 2 >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ] ======= ======= <<<<<<< HEAD <<<<<<< HEAD ] ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) let(:author) { create(:author) } <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) RSpec.describe BookDecorator do ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= let(:author) { create(:author) } >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= let(:author) { create(:author) } >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    127. <<<<<<< HEAD <<<<<<< HEAD
    128. 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
    129. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    130. ======= <<<<<<< HEAD
    131. =======
    132. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    133. >>>>>>> bd8bda4 (Manifest_cache true) =======
    134. >>>>>>> aa7b40c (Manifest_cache true) =======
    135. >>>>>>> 183b6c5 (Manifest_cache true) =======
    136. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    137. <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD =======
    138. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    139. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    140. >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs)
    141. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true)
    142. =======
    143. >>>>>>> bd8bda4 (Manifest_cache true) =======
    144. >>>>>>> aa7b40c (Manifest_cache true) =======
    145. >>>>>>> 183b6c5 (Manifest_cache true) =======
    146. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    147. <<<<<<< HEAD =======
    148. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 1 >>>>>>> c033601 (Rebased) =======
    149. 1 >>>>>>> a5d032d (Fix) ======= 1 >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) describe '#full_name' do
    150. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    151. ======= <<<<<<< HEAD
    152. =======
    153. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    154. >>>>>>> bd8bda4 (Manifest_cache true) =======
    155. >>>>>>> aa7b40c (Manifest_cache true) =======
    156. >>>>>>> 183b6c5 (Manifest_cache true) =======
    157. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
    158. =======
    159. [
    160. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
    161. >>>>>>> a5d032d (Fix) =======
    162. >>>>>>> 824bb2b (Featire specs) 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
    163. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    164. >>>>>>> c033601 (Rebased) =======
    165. >>>>>>> a5d032d (Fix) =======
    166. >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) end
    167. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true)
    168. >>>>>>> c59d1a99 (Manifest_cache true) 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    169. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    170. >>>>>>> 7c4ea7f (Fix)
    171. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) describe '#full_name' do
    172. =======
    173. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
    174. <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= end
    175. <<<<<<< HEAD ======= <<<<<<< HEAD
    176. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
    177. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
    178. <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= =======
    179. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
    180. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= =======
    181. >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
    182. ]
    183. end
    184. 1 let(:categories) do
    185. [
    186. 2 FactoryBot.create(:category, name: 'Poetry'),
    187. FactoryBot.create(:category, name: 'Novel')
    188. ]
    189. end
    190. 1 context 'when decorate' do
    191. 1 it '#authors_names' do
    192. 1 expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
    193. end
    194. 1 it '#categories_names' do
    195. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
    196. end
    197. end
    198. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) end
    <<<<<<< HEAD
    ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true)
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= =======
    >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)

    spec/decorators/book_decorator_spec.rb

    100.0% lines covered

    <<<<<<< HEAD 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= 15 relevant lines. 15 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= 15 relevant lines. 15 lines covered and >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 0 lines missed.
        
    1. 1 RSpec.describe BookDecorator do
    2. 4 subject(:decorated_object) { described_class.new(book) }
    3. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    4. 1 <<<<<<< HEAD let(:book) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) let(:book) do ======= resources :books, only: %i[show index] >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) RSpec.describe BookDecorator do ======= resources :books, only: %i[show index] >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= resources :books, only: %i[show index] >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) do >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= =======
    5. <<<<<<< HEAD
    6. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    7. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    8. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
    9. <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    10. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
    11. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD =======
    12. >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD categories_count: 0, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD categories_count: 0, ======= ======= ======= categories_count: 0, >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= categories_count: 0, >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    14. =======
    15. >>>>>>> ae2a012 (Manifest_cache true) =======
    16. >>>>>>> 998f08d (Manifest_cache true) 1 <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true) ======= let(:authors) do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true)
    17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) authors_count: 0) ======= [ >>>>>>> 02a399d (Manifest_cache true) ======= [ >>>>>>> bd8bda4 (Manifest_cache true) ======= [ >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= [ >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= [ >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= [ >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= [ >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= authors_count: 0) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= authors_count: 0) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= authors_count: 0) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    19. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix)
    20. <<<<<<< HEAD =======
    21. 2 >>>>>>> 02a399d (Manifest_cache true) =======
    22. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
    23. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    24. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    25. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    26. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    27. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    28. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) end ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= end >>>>>>> 5b7749a (Fix) ======= subject(:decorated_object) { described_class.new(author) } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= end >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= end >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    30. 1 =======
    31. >>>>>>> 02a399d (Manifest_cache true) =======
    32. =======
    33. >>>>>>> ae2a012 (Manifest_cache true) 2 >>>>>>> 7375d4b (Manifest_cache true) =======
    34. >>>>>>> bd8bda4 (Manifest_cache true) =======
    35. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    36. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    37. =======
    38. >>>>>>> c7a726c5 (Rebased) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    39. <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
    40. 1 >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) =======
    41. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    42. 1 >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) let(:authors) do ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= let(:authors) do >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    44. =======
    45. >>>>>>> ae2a012 (Manifest_cache true) =======
    46. >>>>>>> bd8bda4 (Manifest_cache true) =======
    47. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
    48. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    49. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
    50. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    51. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
    52. >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    53. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    54. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) [
    55. <<<<<<< HEAD
    56. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    57. 3 ======= <<<<<<< HEAD
    58. =======
    59. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    60. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    61. 3 >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
    62. <<<<<<< HEAD
    63. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    64. =======
    65. >>>>>>> ae2a012 (Manifest_cache true) =======
    66. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    67. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
    68. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ]
    69. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    70. <<<<<<< HEAD =======
    71. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= =======
    72. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
    73. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    74. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
    75. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
    76. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
    77. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    78. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    79. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) end
    80. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    81. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    82. ======= <<<<<<< HEAD
    83. =======
    84. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    85. >>>>>>> bd8bda4 (Manifest_cache true) =======
    86. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    87. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
    88. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
    89. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    90. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    91. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
    92. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
    93. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    94. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    95. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 1 let(:categories) do
    96. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    97. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    98. ======= <<<<<<< HEAD
    99. =======
    100. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    101. >>>>>>> bd8bda4 (Manifest_cache true) =======
    102. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    103. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
    104. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
    105. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    106. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    107. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
    108. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
    109. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    110. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    111. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) [
    112. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    113. 3 >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    114. ======= <<<<<<< HEAD
    115. =======
    116. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    117. >>>>>>> bd8bda4 (Manifest_cache true) =======
    118. >>>>>>> aa7b40c (Manifest_cache true) =======
    119. >>>>>>> 183b6c5 (Manifest_cache true) =======
    120. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true)
    121. >>>>>>> c033601 (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    122. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD
    123. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
    124. 1 >>>>>>> fd6db03 (Manifest_cache true) =======
    125. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    126. >>>>>>> c033601 (Rebased) 2 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    127. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) =======
    128. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    129. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    130. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
    131. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    132. 3 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    133. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    134. 3 >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) let(:author) { create(:author) } ======= ======= <<<<<<< HEAD let(:author) { create(:author) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:author) { create(:author) } ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD let(:author) { create(:author) } ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) create(:category, name: FFaker::Book.genre), >>>>>>> 2722d07 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) RSpec.describe BookDecorator do ======= let(:author) { create(:author) } >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= let(:author) { create(:author) } >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    135. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    136. >>>>>>> 31d15e66 (Fix) =======
    137. >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    138. 3 <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true)
    139. <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD
    140. 3 <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    141. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)
    142. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    143. ======= <<<<<<< HEAD
    144. =======
    145. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    146. >>>>>>> bd8bda4 (Manifest_cache true) =======
    147. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD =======
    148. >>>>>>> 183b6c5 (Manifest_cache true) =======
    149. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    150. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    151. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    152. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    153. >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= =======
    154. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= =======
    155. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    156. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= =======
    157. >>>>>>> bd8bda4 (Manifest_cache true) =======
    158. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    159. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    160. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
    161. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    162. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
    163. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    164. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    165. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) create(:category, name: FFaker::Book.genre) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    166. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    167. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
    168. >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    169. ======= <<<<<<< HEAD
    170. =======
    171. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    172. >>>>>>> bd8bda4 (Manifest_cache true) =======
    173. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    174. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
    175. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
    176. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) =======
    177. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    178. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
    179. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
    180. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
    181. >>>>>>> 7c4ea7f (Fix) ======= =======
    182. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    183. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) =======
    184. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    185. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 1 >>>>>>> c033601 (Rebased) =======
    186. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 1 >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) describe '#full_name' do
    187. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    188. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
    189. >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    190. ======= <<<<<<< HEAD
    191. =======
    192. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    193. >>>>>>> bd8bda4 (Manifest_cache true) =======
    194. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    195. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
    196. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
    197. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
    198. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
    199. >>>>>>> e3e66f3 (Featire specs) =======
    200. [
    201. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    202. >>>>>>> a5d032d (Fix) <<<<<<< HEAD =======
    203. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= =======
    204. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= =======
    205. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    206. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    207. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") } ======= let(:author) { create(:author) } >>>>>>> c7a726c5 (Rebased)
    208. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    209. >>>>>>> c033601 (Rebased) =======
    210. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    211. >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    212. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= =======
    213. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    214. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
    215. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
    216. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) =======
    217. 1 describe '#full_name' do
    218. 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
    219. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    220. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    221. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) end
    222. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs)
    223. ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true)
    224. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    225. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
    226. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) =======
    227. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
    228. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    229. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
    230. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
    231. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
    232. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
    233. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    234. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    235. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    236. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    237. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    238. =======
    239. >>>>>>> 02a399d (Manifest_cache true) =======
    240. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
    241. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    242. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
    243. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
    244. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
    245. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
    246. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    247. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    248. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) describe '#categories_names' do >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) it '#authors_names' do ======= <<<<<<< HEAD context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= it '#authors_names' do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= describe '#categories_names' do >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= describe '#categories_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= describe '#categories_names' do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    249. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    250. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    251. 2 =======
    252. 1 >>>>>>> 02a399d (Manifest_cache true) =======
    253. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) =======
    254. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    255. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
    256. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
    257. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
    258. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    259. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    260. 2 >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= <<<<<<< HEAD it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    261. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
    262. ======= <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    263. 1 =======
    264. >>>>>>> fd6db03 (Manifest_cache true) =======
    265. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> 998f08d (Manifest_cache true)
    266. <<<<<<< HEAD <<<<<<< HEAD end
    267. <<<<<<< HEAD ======= <<<<<<< HEAD =======
    268. >>>>>>> 02a399d (Manifest_cache true) ======= =======
    269. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    270. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 31d15e66 (Fix) ======= end >>>>>>> a5d032d (Fix) ======= end >>>>>>> 824bb2b (Featire specs)
    271. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    272. 1 it '#categories_names' do
    273. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
    274. end
    275. =======
    276. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    277. >>>>>>> bd8bda4 (Manifest_cache true) =======
    278. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
    279. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    280. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) =======
    281. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
    282. <<<<<<< HEAD ======= <<<<<<< HEAD
    283. ======= >>>>>>> 7375d4b (Manifest_cache true)
    284. end
    285. 1 it '#categories_names' do
    286. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
    287. end
    288. ======= >>>>>>> c59d1a99 (Manifest_cache true) =======
    289. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
    290. <<<<<<< HEAD
    291. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
    292. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 89d7dcd2 (Manifest_cache true)
    293. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
    294. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
    295. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= =======
    296. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    297. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    298. >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    299. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= =======
    300. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
    301. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
    302. ]
    303. end
    304. 1 let(:categories) do
    305. [
    306. 2 FactoryBot.create(:category, name: 'Poetry'),
    307. FactoryBot.create(:category, name: 'Novel')
    308. ]
    309. end
    310. 1 context 'when decorate' do
    311. 1 it '#authors_names' do
    312. 1 expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
    313. end
    314. 1 it '#categories_names' do
    315. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
    316. end
    317. end
    318. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD
    ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= =======
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
    >>>>>>> c033601 (Rebased) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

    spec/decorators/book_decorator_spec.rb

    100.0% lines covered

    <<<<<<< HEAD 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 13 relevant lines. 13 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= 15 relevant lines. 15 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= 15 relevant lines. 15 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 0 lines missed.
        
    1. 1 RSpec.describe BookDecorator do
    2. 4 subject(:decorated_object) { described_class.new(book) }
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    4. 1 <<<<<<< HEAD let(:book) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) let(:book) do ======= resources :books, only: %i[show index] >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) RSpec.describe BookDecorator do ======= resources :books, only: %i[show index] >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) resources :books, only: %i[show index] >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe BookDecorator do
    5. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs)
    7. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs)
    8. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    9. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
    10. <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    11. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
    12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    13. >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    14. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD categories_count: 0, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD categories_count: 0, ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) categories_count: 0, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD categories_count: 0, ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= categories_count: 0, ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= categories_count: 0, ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= categories_count: 0, >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= categories_count: 0, >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= categories_count: 0, >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= categories_count: 0, ======= =======
    15. <<<<<<< HEAD
    16. =======
    17. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    19. =======
    20. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true) ======= let(:authors) do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    22. <<<<<<< HEAD authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD authors_count: 0) ======= ======= authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) [ >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= [ >>>>>>> bd8bda4 (Manifest_cache true) ======= [ >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= [ >>>>>>> 183b6c5 (Manifest_cache true) ======= [ >>>>>>> fd6db03 (Manifest_cache true) ======= authors_count: 0) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= authors_count: 0) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= authors_count: 0) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    23. ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    24. >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix)
    25. <<<<<<< HEAD ======= =======
    26. 2 >>>>>>> 02a399d (Manifest_cache true) =======
    27. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
    28. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
    29. 2 >>>>>>> 183b6c5 (Manifest_cache true) =======
    30. 2 >>>>>>> fd6db03 (Manifest_cache true) =======
    31. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    32. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b28889f (Fix)
    33. <<<<<<< HEAD ======= =======
    34. 2 >>>>>>> 02a399d (Manifest_cache true) =======
    35. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
    36. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD =======
    37. 2 >>>>>>> 183b6c5 (Manifest_cache true) =======
    38. 2 >>>>>>> fd6db03 (Manifest_cache true) =======
    39. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= =======
    40. ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    41. >>>>>>> ae2a012 (Manifest_cache true) =======
    42. 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) end ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= end >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= end >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    43. <<<<<<< HEAD
    44. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    45. 1 ======= =======
    46. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
    47. 1 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    48. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
    49. =======
    50. >>>>>>> ae2a012 (Manifest_cache true) 2 >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
    51. >>>>>>> bd8bda4 (Manifest_cache true) =======
    52. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    53. >>>>>>> 183b6c5 (Manifest_cache true) =======
    54. >>>>>>> fd6db03 (Manifest_cache true) =======
    55. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    56. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:authors) do ======= ======= let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) ======= let(:authors) do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    57. <<<<<<< HEAD
    58. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    59. ======= =======
    60. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
    61. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    62. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD =======
    63. >>>>>>> bd8bda4 (Manifest_cache true) =======
    64. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    65. >>>>>>> 183b6c5 (Manifest_cache true) =======
    66. >>>>>>> fd6db03 (Manifest_cache true) =======
    67. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    68. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    69. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) [
    70. <<<<<<< HEAD
    71. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs)
    72. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD
    73. 3 ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    74. =======
    75. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
    76. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    77. 3 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
    78. <<<<<<< HEAD
    79. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    80. ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
    81. ======= <<<<<<< HEAD <<<<<<< HEAD
    82. ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
    83. ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    84. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD =======
    85. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    86. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    87. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
    88. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ]
    89. <<<<<<< HEAD
    90. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    91. ======= =======
    92. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true)
    93. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    94. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
    95. >>>>>>> bd8bda4 (Manifest_cache true) =======
    96. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    97. >>>>>>> 183b6c5 (Manifest_cache true) =======
    98. >>>>>>> fd6db03 (Manifest_cache true) =======
    99. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    100. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    101. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
    102. <<<<<<< HEAD
    103. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    104. ======= =======
    105. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    106. >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    107. >>>>>>> 2722d07 (Manifest_cache true) =======
    108. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
    109. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    110. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
    111. =======
    112. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
    113. >>>>>>> bd8bda4 (Manifest_cache true) =======
    114. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    115. >>>>>>> 183b6c5 (Manifest_cache true) =======
    116. >>>>>>> fd6db03 (Manifest_cache true) =======
    117. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    118. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    119. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 1 let(:categories) do
    120. <<<<<<< HEAD
    121. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    122. ======= =======
    123. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
    124. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    125. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
    126. =======
    127. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
    128. >>>>>>> bd8bda4 (Manifest_cache true) =======
    129. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    130. >>>>>>> 183b6c5 (Manifest_cache true) =======
    131. >>>>>>> fd6db03 (Manifest_cache true) =======
    132. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    133. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    134. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) [
    135. <<<<<<< HEAD
    136. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    137. 3 ======= =======
    138. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
    139. 3 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    140. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
    141. =======
    142. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) 2 >>>>>>> 02a399d (Manifest_cache true) =======
    143. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
    144. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    145. 2 >>>>>>> 183b6c5 (Manifest_cache true) =======
    146. 2 >>>>>>> fd6db03 (Manifest_cache true) =======
    147. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    148. 3 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD create(:category, name: FFaker::Book.genre), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:category, name: FFaker::Book.genre), ======= ======= create(:category, name: FFaker::Book.genre), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) create(:category, name: FFaker::Book.genre), ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    149. <<<<<<< HEAD
    150. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    151. ======= =======
    152. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
    153. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    154. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
    155. =======
    156. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
    157. >>>>>>> bd8bda4 (Manifest_cache true) =======
    158. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    159. >>>>>>> 183b6c5 (Manifest_cache true) =======
    160. >>>>>>> fd6db03 (Manifest_cache true) =======
    161. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    162. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    163. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD create(:category, name: FFaker::Book.genre) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:category, name: FFaker::Book.genre) ======= ======= create(:category, name: FFaker::Book.genre) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) create(:category, name: FFaker::Book.genre) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= create(:category, name: FFaker::Book.genre) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    164. <<<<<<< HEAD
    165. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    166. ======= =======
    167. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
    168. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    169. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
    170. =======
    171. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
    172. >>>>>>> bd8bda4 (Manifest_cache true) =======
    173. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    174. >>>>>>> 183b6c5 (Manifest_cache true) =======
    175. >>>>>>> fd6db03 (Manifest_cache true) =======
    176. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    177. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    178. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ]
    179. <<<<<<< HEAD
    180. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    181. ======= =======
    182. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
    183. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    184. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
    185. =======
    186. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
    187. >>>>>>> bd8bda4 (Manifest_cache true) =======
    188. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    189. >>>>>>> 183b6c5 (Manifest_cache true) =======
    190. >>>>>>> fd6db03 (Manifest_cache true) =======
    191. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    192. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    193. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) end
    194. <<<<<<< HEAD
    195. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    196. ======= =======
    197. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
    198. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= =======
    199. ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
    200. ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    201. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    202. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true)
    203. >>>>>>> 02a399d (Manifest_cache true) =======
    204. >>>>>>> bd8bda4 (Manifest_cache true) =======
    205. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    206. >>>>>>> 183b6c5 (Manifest_cache true) =======
    207. >>>>>>> fd6db03 (Manifest_cache true) =======
    208. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    209. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    210. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    211. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    212. <<<<<<< HEAD
    213. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    214. ======= =======
    215. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true)
    216. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    217. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
    218. >>>>>>> bd8bda4 (Manifest_cache true) =======
    219. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    220. >>>>>>> 183b6c5 (Manifest_cache true) =======
    221. >>>>>>> fd6db03 (Manifest_cache true) =======
    222. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    223. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    224. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 1 <<<<<<< HEAD describe '#categories_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe '#categories_names' do ======= ======= describe '#categories_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) describe '#categories_names' do ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it '#authors_names' do >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#categories_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= describe '#categories_names' do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= describe '#categories_names' do >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    225. <<<<<<< HEAD
    226. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    227. 2 ======= =======
    228. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true)
    229. 2 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    230. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
    231. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
    232. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    233. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
    234. 1 >>>>>>> fd6db03 (Manifest_cache true) =======
    235. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    236. 2 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    237. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    238. ======= ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD =======
    239. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    240. 1 <<<<<<< HEAD ======= =======
    241. =======
    242. =======
    243. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= =======
    244. 1 >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true) <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true)
    245. <<<<<<< HEAD <<<<<<< HEAD
    246. ======= <<<<<<< HEAD
    247. =======
    248. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) =======
    249. >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true) end >>>>>>> 7375d4b (Manifest_cache true)
    250. <<<<<<< HEAD
    251. <<<<<<< HEAD =======
    252. >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD =======
    253. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    254. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    255. >>>>>>> 7c4ea7f (Fix) end
    256. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    257. 1 it '#categories_names' do
    258. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
    259. ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) end
    260. =======
    261. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b47 (Fix) end ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 67ab5299 (Fix) ======= end >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    262. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true)
    263. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    264. 1 =======
    265. =======
    266. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) it '#categories_names' do
    267. <<<<<<< HEAD
    268. =======
    269. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true)
    270. <<<<<<< HEAD
    271. end
    272. =======
    273. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    274. >>>>>>> bd8bda4 (Manifest_cache true) =======
    275. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true) end
    276. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true)
    277. =======
    278. >>>>>>> 02a399d (Manifest_cache true) =======
    279. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    280. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) =======
    281. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    282. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    283. <<<<<<< HEAD
    284. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix)
    285. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
    286. =======
    287. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
    288. >>>>>>> fd6db03 (Manifest_cache true) =======
    289. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    290. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    291. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD
    292. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    293. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
    294. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    295. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD describe '#authors_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d9d85ca6 (Fix) describe '#authors_names' do
    296. <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
    297. =======
    298. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= =======
    299. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= describe '#authors_names' do ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) ======= it '#categories_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#authors_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= describe '#authors_names' do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= describe '#authors_names' do >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> e59c273d (Manifest_cache true)
    300. <<<<<<< HEAD
    301. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    302. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD
    303. =======
    304. >>>>>>> 02a399d (Manifest_cache true) =======
    305. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD
    306. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    307. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) =======
    308. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    309. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    310. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) 1 <<<<<<< HEAD it { ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) it { <<<<<<< HEAD ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD it { >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= it { >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= it { >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    311. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    312. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
    313. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 67ab5299 (Fix)
    314. <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true)
    315. ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true)
    316. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    317. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) <<<<<<< HEAD end
    318. ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true) ======= end >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
    319. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 21793167 (Manifest_cache true)
    320. 1 =======
    321. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
    322. <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true)
    323. 1 <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) <<<<<<< HEAD it '#categories_names' do ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= it '#categories_names' do >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price)
    324. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    325. ======= ======= >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price)
    326. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
    327. end
    328. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
    329. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    330. >>>>>>> bd8bda4 (Manifest_cache true) =======
    331. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= =======
    332. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= =======
    333. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    334. >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) end
    335. <<<<<<< HEAD
    336. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
    337. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    338. =======
    339. >>>>>>> 02a399d (Manifest_cache true) =======
    340. >>>>>>> a5d032d (Fix) =======
    341. >>>>>>> 824bb2b (Featire specs)
    342. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    343. =======
    344. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= =======
    345. >>>>>>> fd6db03 (Manifest_cache true) =======
    346. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    347. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= it '#categories_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#authors_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= describe '#authors_names' do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    348. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    349. =======
    350. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= =======
    351. >>>>>>> fd6db03 (Manifest_cache true) =======
    352. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
    353. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= it { >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= it { >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    354. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    355. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
    356. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true)
    357. ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true)
    358. end
    359. 1 it '#categories_names' do
    360. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
    361. end
    362. end
    363. <<<<<<< HEAD
    364. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
    365. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
    366. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    367. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    368. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    369. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= =======
    370. >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= =======
    371. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) "#{authors.last.first_name} #{authors.last.last_name}")
    372. }
    373. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) =======
    374. >>>>>>> 02a399d (Manifest_cache true) =======
    375. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    376. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
    377. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) end
    378. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    379. 1 describe '#price' do
    380. 2 it { expect(decorated_object.price).to eq(1.23.to_money) }
    381. end
    382. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) =======
    383. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= =======
    384. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    385. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    386. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
    387. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    388. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
    389. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    390. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= =======
    391. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
    392. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
    393. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    394. >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= =======
    395. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
    396. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
    397. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    398. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
    399. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    400. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    spec/factories/addresses.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :address do
    3. end
    4. end

    spec/factories/admin_users.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true)

    spec/factories/authors.rb

    >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD =======

    spec/factories/authors.rb

    >>>>>>> 752f0c0 (Featire specs) =======

    spec/factories/authors.rb

    >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)

    spec/factories/authors.rb

    <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= =======

    spec/factories/authors.rb

    <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

    spec/factories/authors.rb

    >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

    spec/factories/authors.rb

    >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) =======

    spec/factories/authors.rb

    >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======

    spec/factories/authors.rb

    >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======

    spec/factories/authors.rb

    >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> ebcdce06 (Featire specs)
    ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    >>>>>>> 9bfbd88 (Featire specs)

    spec/decorators/book_decorator_spec.rb

    100.0% lines covered

    15 relevant lines. 15 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe BookDecorator do
    2. 4 subject(:decorated_object) { described_class.new(book) }
    3. 1 let(:book) do
    4. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
    5. categories_count: 0,
    6. authors_count: 0)
    7. end
    8. 1 let(:authors) do
    9. [
    10. 3 create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
    11. create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
    12. ]
    13. end
    14. 1 let(:categories) do
    15. [
    16. 3 create(:category, name: FFaker::Book.genre),
    17. create(:category, name: FFaker::Book.genre)
    18. ]
    19. end
    20. 1 describe '#categories_names' do
    21. 2 it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
    22. end
    23. 1 describe '#authors_names' do
    24. 1 it {
    25. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
    26. "#{authors.last.first_name} #{authors.last.last_name}")
    27. }
    28. end
    29. 1 describe '#price' do
    30. 2 it { expect(decorated_object.price).to eq(1.23.to_money) }
    31. end
    32. end

    spec/factories/addresses.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :address do
    3. end
    4. end

    spec/factories/admin_users.rb

    >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======

    spec/factories/authors.rb

    >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) factory :admin_user do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= factory :admin_user do ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= factory :admin_user do ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) factory :admin_user do ======= factory :author do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= factory :author do >>>>>>> 752f0c0 (Featire specs) ======= factory :author do >>>>>>> 4e81ea2 (Featire specs) ======= factory :author do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= factory :admin_user do >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= factory :author do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= factory :author do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= factory :author do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 0d6dd12 (Manifest_cache true) ======= factory :author do >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= factory :author do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= factory :admin_user do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= factory :author do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= factory :author do >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= factory :admin_user do >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= factory :admin_user do >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= factory :admin_user do >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. 13 =======
    5. 15 >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs)
    6. 13 =======
    7. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD =======
    8. 1 >>>>>>> 752f0c0 (Featire specs) =======
    9. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    10. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
    11. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
    12. 1 >>>>>>> 75fa7e1b (Rebased) =======
    13. 15 >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs)
    14. 15 ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) =======
    15. 15 ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs)
    16. 13 =======
    17. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    18. 15 =======
    19. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    20. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
    21. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    22. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    23. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    24. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
    25. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= =======
    26. 15 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    27. 15 =======
    28. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
    29. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= =======
    30. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    31. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
    32. 15 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    33. 13 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
    34. 1 >>>>>>> 11792758 (Rebased) =======
    35. 15 >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= =======
    36. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) email { FFaker::Internet.email } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= email { FFaker::Internet.email } ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= email { FFaker::Internet.email } ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) email { FFaker::Internet.email } ======= first_name { FFaker::Name.first_name } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 4e81ea2 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= email { FFaker::Internet.email } >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 0d6dd12 (Manifest_cache true) ======= first_name { FFaker::Name.first_name } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= email { FFaker::Internet.email } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= email { FFaker::Internet.email } >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= email { FFaker::Internet.email } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= email { FFaker::Internet.email } >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    37. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    38. 13 =======
    39. 15 >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs)
    40. 13 =======
    41. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD =======
    42. 1 >>>>>>> 752f0c0 (Featire specs) =======
    43. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    44. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
    45. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
    46. 1 >>>>>>> 75fa7e1b (Rebased) =======
    47. 15 >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix)
    48. 15 ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) =======
    49. 15 ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs)
    50. 13 =======
    51. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)
    52. 15 =======
    53. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    54. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
    55. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    56. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    57. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    58. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
    59. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= =======
    60. 15 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    61. 15 =======
    62. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
    63. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= =======
    64. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    65. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
    66. 15 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    67. 13 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
    68. 1 >>>>>>> 11792758 (Rebased) =======
    69. 15 >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= =======
    70. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) password { 'adminPassword' } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= password { 'adminPassword' } ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= password { 'adminPassword' } ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) password { 'adminPassword' } ======= last_name { FFaker::Name.last_name } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 4e81ea2 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= password { 'adminPassword' } >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 0d6dd12 (Manifest_cache true) ======= last_name { FFaker::Name.last_name } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= password { 'adminPassword' } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= password { 'adminPassword' } >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= password { 'adminPassword' } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= password { 'adminPassword' } >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    71. end
    72. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    spec/factories/authors.rb

    80.0% lines covered

    10 relevant lines. 8 lines covered and 2 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :author do
    3. 5 first_name { FFaker::Name.first_name }
    4. 5 last_name { FFaker::Name.last_name }
    5. 1 transient do
    6. 1 books_count { 1 }
    7. end
    8. 1 after :create do |author, books_count|
    9. 10 author.books do
    10. Array.new(books_count) do
    11. association(:author, books: [instance])
    12. end
    13. end
    14. end
    15. end
    16. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    spec/factories/authors_books.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :authors_book do
    3. 1 author
    4. 1 book
    5. end
    6. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)

    spec/factories/billings.rb

    ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)

    spec/factories/billings.rb

    =======

    spec/factories/books.rb

    >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======

    spec/factories/books.rb

    >>>>>>> 752f0c0 (Featire specs) =======

    spec/factories/books.rb

    >>>>>>> 4e81ea2 (Featire specs) =======

    spec/factories/books.rb

    >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======

    spec/factories/books.rb

    >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======

    spec/factories/billings.rb

    >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs)

    spec/factories/books.rb

    >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

    spec/factories/books.rb

    >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

    spec/factories/books.rb

    >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

    spec/factories/books.rb

    >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======

    spec/factories/billings.rb

    >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======

    spec/factories/books.rb

    >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======

    spec/factories/billings.rb

    >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======

    spec/factories/billings.rb

    >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======

    spec/factories/billings.rb

    >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 8 relevant lines. 8 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 8 relevant lines. 8 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) factory :billing do ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) factory :billing do
    3. <<<<<<< HEAD <<<<<<< HEAD
    4. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    5. 1 =======
    6. 3 >>>>>>> 02a399d (Manifest_cache true) =======
    7. 82 =======
    8. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    9. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    10. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    11. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    12. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
    13. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
    14. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
    15. 1 >>>>>>> 11792758 (Rebased) user
    16. <<<<<<< HEAD <<<<<<< HEAD
    17. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    18. 1 =======
    19. 3 >>>>>>> 02a399d (Manifest_cache true) =======
    20. 92 =======
    21. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    22. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    23. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    24. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    25. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
    26. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
    27. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
    28. 1 >>>>>>> 11792758 (Rebased) address { FFaker::AddressUA.street_address }
    29. <<<<<<< HEAD <<<<<<< HEAD
    30. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    31. 1 =======
    32. 3 >>>>>>> 02a399d (Manifest_cache true) =======
    33. 82 =======
    34. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    35. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    36. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    37. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    38. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
    39. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
    40. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
    41. 1 >>>>>>> 11792758 (Rebased) city { FFaker::AddressUA.city }
    42. <<<<<<< HEAD <<<<<<< HEAD
    43. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    44. 1 =======
    45. 3 >>>>>>> 02a399d (Manifest_cache true) =======
    46. 92 =======
    47. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    48. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    49. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    50. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    51. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
    52. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
    53. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
    54. 1 >>>>>>> 11792758 (Rebased) zip { FFaker::AddressUA.zip_code }
    55. <<<<<<< HEAD <<<<<<< HEAD
    56. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    57. 1 =======
    58. 3 >>>>>>> 02a399d (Manifest_cache true) =======
    59. 92 =======
    60. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    61. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    62. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    63. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    64. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
    65. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
    66. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
    67. 1 >>>>>>> 11792758 (Rebased) country { FFaker::AddressUA.country }
    68. <<<<<<< HEAD <<<<<<< HEAD
    69. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    70. 1 =======
    71. 3 >>>>>>> 02a399d (Manifest_cache true) =======
    72. 92 =======
    73. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    74. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    75. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    76. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    77. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
    78. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
    79. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
    80. 1 >>>>>>> 11792758 (Rebased) phone { FFaker::PhoneNumberUA.home_phone_number }
    81. <<<<<<< HEAD <<<<<<< HEAD
    82. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    83. =======
    84. 3 =======
    85. 92 =======
    86. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    87. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    88. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
    89. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    90. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
    91. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
    92. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
    93. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) =======
    94. >>>>>>> 11792758 (Rebased) end
    95. end

    spec/factories/books.rb

    80.95% lines covered

    21 relevant lines. 17 lines covered and 4 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) factory :book do >>>>>>> c7a726c5 (Rebased)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    4. 95 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
    5. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    6. 1 =======
    7. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    8. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
    9. 82 =======
    10. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
    11. 80 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
    12. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
    13. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
    14. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    15. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    16. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
    17. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
    18. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
    19. 80 >>>>>>> 4e81ea2 (Featire specs) =======
    20. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    21. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
    22. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
    23. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
    24. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    25. 1 =======
    26. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    27. 82 =======
    28. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    29. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    30. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    31. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    32. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    33. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
    34. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
    35. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    36. 82 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
    37. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    38. 95 >>>>>>> c7a726c5 (Rebased) =======
    39. 95 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    40. 3 ======= <<<<<<< HEAD
    41. 82 =======
    42. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    43. 80 >>>>>>> 752f0c0 (Featire specs) =======
    44. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    45. 80 >>>>>>> 4e81ea2 (Featire specs) =======
    46. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    47. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    48. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    49. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
    50. 95 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs)
    51. 95 =======
    52. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
    53. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
    54. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    55. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= =======
    56. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= =======
    57. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= =======
    58. 97 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) user
    59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    60. 109 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
    61. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    62. 1 =======
    63. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    64. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
    65. 92 =======
    66. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
    67. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
    68. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
    69. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
    70. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    71. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    72. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
    73. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
    74. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
    75. 90 >>>>>>> 4e81ea2 (Featire specs) =======
    76. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    77. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
    78. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
    79. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
    80. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    81. 1 =======
    82. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    83. 92 =======
    84. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    85. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    86. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    87. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    88. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    89. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
    90. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
    91. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    92. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
    93. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    94. 109 >>>>>>> c7a726c5 (Rebased) =======
    95. 109 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    96. 3 ======= <<<<<<< HEAD
    97. 92 =======
    98. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    99. 90 >>>>>>> 752f0c0 (Featire specs) =======
    100. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    101. 90 >>>>>>> 4e81ea2 (Featire specs) =======
    102. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    103. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    104. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    105. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
    106. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs)
    107. 109 =======
    108. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
    109. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
    110. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    111. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= =======
    112. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= =======
    113. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= =======
    114. 111 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) address { FFaker::AddressUA.street_address }
    115. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    116. 92 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
    117. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    118. 1 =======
    119. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    120. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
    121. 82 =======
    122. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
    123. 80 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
    124. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
    125. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
    126. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    127. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    128. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
    129. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
    130. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
    131. 80 >>>>>>> 4e81ea2 (Featire specs) =======
    132. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    133. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
    134. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
    135. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
    136. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    137. 1 =======
    138. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    139. 82 =======
    140. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    141. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    142. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    143. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    144. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    145. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
    146. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
    147. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    148. 82 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
    149. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    150. 92 >>>>>>> c7a726c5 (Rebased) =======
    151. 92 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    152. 3 ======= <<<<<<< HEAD
    153. 82 =======
    154. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    155. 80 >>>>>>> 752f0c0 (Featire specs) =======
    156. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    157. 80 >>>>>>> 4e81ea2 (Featire specs) =======
    158. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    159. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    160. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    161. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
    162. 92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs)
    163. 92 =======
    164. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
    165. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
    166. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    167. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= =======
    168. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= =======
    169. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= =======
    170. 94 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD city { FFaker::AddressUA.city } ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= price { FFaker::Number.rand(100) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    171. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    172. 109 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
    173. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    174. 1 =======
    175. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    176. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
    177. 92 =======
    178. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
    179. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
    180. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
    181. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
    182. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    183. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    184. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
    185. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
    186. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
    187. 90 >>>>>>> 4e81ea2 (Featire specs) =======
    188. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    189. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
    190. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
    191. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
    192. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    193. 1 =======
    194. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    195. 92 =======
    196. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    197. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    198. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    199. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    200. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    201. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
    202. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
    203. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    204. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
    205. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    206. 109 >>>>>>> c7a726c5 (Rebased) =======
    207. 109 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    208. 3 ======= <<<<<<< HEAD
    209. 92 =======
    210. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    211. 90 >>>>>>> 752f0c0 (Featire specs) =======
    212. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    213. 90 >>>>>>> 4e81ea2 (Featire specs) =======
    214. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    215. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    216. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    217. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
    218. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs)
    219. 109 =======
    220. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
    221. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
    222. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    223. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= =======
    224. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= =======
    225. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= =======
    226. 111 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) zip { FFaker::AddressUA.zip_code }
    227. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    228. 109 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
    229. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    230. 1 =======
    231. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    232. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
    233. 92 =======
    234. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
    235. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
    236. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
    237. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
    238. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    239. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    240. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
    241. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
    242. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
    243. 90 >>>>>>> 4e81ea2 (Featire specs) =======
    244. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    245. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
    246. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
    247. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
    248. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    249. 1 =======
    250. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    251. 92 =======
    252. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    253. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    254. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    255. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    256. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    257. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
    258. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
    259. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    260. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
    261. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    262. 109 >>>>>>> c7a726c5 (Rebased) =======
    263. 109 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    264. 3 ======= <<<<<<< HEAD
    265. 92 =======
    266. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    267. 90 >>>>>>> 752f0c0 (Featire specs) =======
    268. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    269. 90 >>>>>>> 4e81ea2 (Featire specs) =======
    270. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    271. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    272. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    273. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
    274. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs)
    275. 109 =======
    276. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
    277. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
    278. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    279. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= =======
    280. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= =======
    281. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= =======
    282. 111 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) country { FFaker::AddressUA.country }
    283. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    284. 109 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
    285. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    286. 1 =======
    287. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    288. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
    289. 92 =======
    290. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
    291. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
    292. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
    293. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
    294. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    295. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    296. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
    297. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
    298. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
    299. 90 >>>>>>> 4e81ea2 (Featire specs) =======
    300. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    301. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
    302. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
    303. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
    304. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    305. 1 =======
    306. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    307. 92 =======
    308. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    309. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    310. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    311. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    312. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    313. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
    314. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
    315. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    316. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
    317. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    318. 109 >>>>>>> c7a726c5 (Rebased) =======
    319. 109 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    320. 3 ======= <<<<<<< HEAD
    321. 92 =======
    322. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    323. 90 >>>>>>> 752f0c0 (Featire specs) =======
    324. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    325. 90 >>>>>>> 4e81ea2 (Featire specs) =======
    326. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    327. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    328. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    329. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
    330. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs)
    331. 109 =======
    332. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
    333. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
    334. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    335. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= =======
    336. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= =======
    337. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= =======
    338. 111 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) phone { FFaker::PhoneNumberUA.home_phone_number }
    339. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
    340. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    341. =======
    342. 3 ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    343. 3 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    344. =======
    345. 3 ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true)
    346. 92 =======
    347. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
    348. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
    349. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    350. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
    351. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    352. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    353. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
    354. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true)
    355. 90 >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true)
    356. 3 >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD
    357. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
    358. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
    359. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true)
    360. =======
    361. 3 <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
    362. 92 =======
    363. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    364. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    365. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    366. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    367. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    368. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
    369. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
    370. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    371. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) =======
    372. 109 >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs)
    373. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    374. 3 ======= <<<<<<< HEAD
    375. 92 =======
    376. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    377. 90 >>>>>>> 752f0c0 (Featire specs) =======
    378. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    379. 90 >>>>>>> 4e81ea2 (Featire specs) =======
    380. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    381. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } ======= ======= ======= >>>>>>> 84003439 (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= =======
    382. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    383. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    384. 109 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs)
    385. 109 =======
    386. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    387. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
    388. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
    389. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
    390. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) =======
    391. 1 >>>>>>> bf554f4 (Rebased) =======
    392. 111 >>>>>>> a5d032d (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 610b6138 (Featire specs) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= >>>>>>> ebcdce06 (Featire specs) quantity { FFaker::Number.rand(0..10) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84003439 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) quantity { FFaker::Number.rand(2..10) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    393. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true) =======
    394. >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
    395. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= =======
    396. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    397. 1 transient do
    398. 1 categories_count { 1 }
    399. end
    400. 1 transient do
    401. 1 authors_count { 1 }
    402. end
    403. 1 after :create do |book, authors_count|
    404. <<<<<<< HEAD
    405. 110 =======
    406. 108 >>>>>>> 824bb2b (Featire specs) book.authors do
    407. Array.new(authors_count) do
    408. association(:book, authors: [instance])
    409. end
    410. end
    411. end
    412. 1 after :create do |book, categories_count|
    413. <<<<<<< HEAD
    414. 110 =======
    415. 108 >>>>>>> 824bb2b (Featire specs) book.categories do
    416. Array.new(categories_count) do
    417. association(:book, categories: [instance])
    418. end
    419. end
    420. end
    421. <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    422. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    423. =======
    424. >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs)
    425. ======= <<<<<<< HEAD
    426. =======
    427. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======
    428. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

    spec/factories/books.rb

    80.95% lines covered

    21 relevant lines. 17 lines covered and 4 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) factory :book do
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. 95 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    5. 3 ======= <<<<<<< HEAD
    6. 82 =======
    7. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    8. 80 >>>>>>> 752f0c0 (Featire specs) =======
    9. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    10. 80 >>>>>>> 4e81ea2 (Featire specs) =======
    11. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    12. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    13. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    14. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    15. 95 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    16. 95 =======
    17. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    18. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    19. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    20. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    21. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    22. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    23. 97 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    24. 97 =======
    25. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    26. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    27. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    28. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
    29. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    30. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
    31. 105 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) title { FFaker::Book.title }
    32. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    33. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    34. 3 ======= <<<<<<< HEAD
    35. 92 =======
    36. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    37. 90 >>>>>>> 752f0c0 (Featire specs) =======
    38. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    39. 90 >>>>>>> 4e81ea2 (Featire specs) =======
    40. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    41. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    42. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    43. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    44. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    45. 109 =======
    46. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    47. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    48. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    49. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    50. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    51. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    52. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    53. 111 =======
    54. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    55. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    56. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    57. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
    58. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    59. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
    60. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) description { FFaker::Book.description }
    61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    62. 92 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    63. 3 ======= <<<<<<< HEAD
    64. 82 =======
    65. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    66. 80 >>>>>>> 752f0c0 (Featire specs) =======
    67. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    68. 80 >>>>>>> 4e81ea2 (Featire specs) =======
    69. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    70. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    71. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    72. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    73. 92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    74. 92 =======
    75. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    76. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    77. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    78. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    79. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    80. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    81. 94 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    82. 94 =======
    83. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    84. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    85. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    86. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
    87. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    88. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
    89. 98 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= price_cents { FFaker::Number.rand(10_000) } ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= price { FFaker::Number.rand(100) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 0d6dd12 (Manifest_cache true) ======= price { FFaker::Number.rand(100) } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    90. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    91. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    92. 3 ======= <<<<<<< HEAD
    93. 92 =======
    94. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    95. 90 >>>>>>> 752f0c0 (Featire specs) =======
    96. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    97. 90 >>>>>>> 4e81ea2 (Featire specs) =======
    98. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    99. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    100. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    101. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    102. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    103. 109 =======
    104. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    105. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    106. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    107. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    108. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    109. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    110. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    111. 111 =======
    112. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    113. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    114. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    115. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
    116. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    117. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
    118. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) materials { FFaker::Book.cover(:format) }
    119. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    120. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    121. 3 ======= <<<<<<< HEAD
    122. 92 =======
    123. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    124. 90 >>>>>>> 752f0c0 (Featire specs) =======
    125. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    126. 90 >>>>>>> 4e81ea2 (Featire specs) =======
    127. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    128. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    129. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    130. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    131. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    132. 109 =======
    133. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    134. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    135. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    136. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    137. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    138. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    139. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    140. 111 =======
    141. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    142. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    143. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    144. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
    145. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    146. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
    147. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) year_of_publication { FFaker::Number.rand(1900..2022) }
    148. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    149. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    150. 3 ======= <<<<<<< HEAD
    151. 92 =======
    152. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    153. 90 >>>>>>> 752f0c0 (Featire specs) =======
    154. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    155. 90 >>>>>>> 4e81ea2 (Featire specs) =======
    156. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    157. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    158. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    159. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    160. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    161. 109 =======
    162. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    163. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    164. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    165. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    166. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    167. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    168. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    169. 111 =======
    170. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    171. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    172. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    173. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
    174. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    175. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
    176. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) dimensions { FFaker::Book.cover(:size) }
    177. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    178. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    179. 3 ======= <<<<<<< HEAD
    180. 92 =======
    181. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    182. 90 >>>>>>> 752f0c0 (Featire specs) =======
    183. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
    184. 90 >>>>>>> 4e81ea2 (Featire specs) =======
    185. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
    186. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= =======
    187. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
    188. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    189. 109 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    190. 109 =======
    191. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    192. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    193. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
    194. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
    195. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    196. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    197. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    198. 111 =======
    199. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    200. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    201. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    202. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
    203. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
    204. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    205. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6e923b9d (Featire specs) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    206. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    207. 1 transient do
    208. 1 categories_count { 1 }
    209. end
    210. 1 transient do
    211. 1 authors_count { 1 }
    212. end
    213. 1 after :create do |book, authors_count|
    214. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    215. 110 =======
    216. 108 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
    217. 108 =======
    218. 110 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
    219. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
    220. 110 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
    221. 110 >>>>>>> 0d6dd12 (Manifest_cache true) =======
    222. 110 >>>>>>> e3e66f3 (Featire specs) =======
    223. 118 >>>>>>> 5b7749a (Fix) book.authors do
    224. Array.new(authors_count) do
    225. association(:book, authors: [instance])
    226. end
    227. end
    228. end
    229. 1 after :create do |book, categories_count|
    230. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    231. 110 =======
    232. 108 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
    233. 108 =======
    234. 110 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
    235. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
    236. 110 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
    237. 110 >>>>>>> 0d6dd12 (Manifest_cache true) =======
    238. 110 >>>>>>> e3e66f3 (Featire specs) =======
    239. 118 >>>>>>> 5b7749a (Fix) book.categories do
    240. Array.new(categories_count) do
    241. association(:book, categories: [instance])
    242. end
    243. end
    244. end
    245. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) end
    246. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs)
    247. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    248. ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs)
    249. =======
    250. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    251. >>>>>>> 752f0c0 (Featire specs) =======
    252. >>>>>>> 4e81ea2 (Featire specs) =======
    253. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    254. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) =======
    255. >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
    256. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    257. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    258. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= =======
    259. >>>>>>> 0d6dd12 (Manifest_cache true) =======
    260. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
    261. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    262. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
    263. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
    264. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= =======
    265. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
    266. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    267. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
    268. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    269. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
    270. >>>>>>> 11792758 (Rebased) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)

    spec/factories/books_categories.rb

    ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)

    spec/factories/books_categories.rb

    =======

    spec/factories/books_category.rb

    >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======

    spec/factories/books_category.rb

    >>>>>>> 752f0c0 (Featire specs) =======

    spec/factories/books_category.rb

    >>>>>>> 4e81ea2 (Featire specs) =======

    spec/factories/books_category.rb

    >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======

    spec/factories/books_category.rb

    >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======

    spec/factories/books_categories.rb

    >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs)

    spec/factories/books_category.rb

    >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

    spec/factories/books_category.rb

    >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

    spec/factories/books_category.rb

    >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

    spec/factories/books_category.rb

    >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======

    spec/factories/books_categories.rb

    >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======

    spec/factories/books_category.rb

    >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======

    spec/factories/books_categories.rb

    >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======

    spec/factories/books_categories.rb

    >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======

    spec/factories/books_categories.rb

    >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :books_category do
    3. 1 book
    4. 1 category
    5. end
    6. end

    spec/factories/categories.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :category do
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs)
    4. 12 ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 251144b4 (Manifest_cache true) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs)
    5. 12 >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
    6. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD
    7. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
    8. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
    9. 12 ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs)
    10. 1 ======= <<<<<<< HEAD
    11. 8 =======
    12. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    13. 8 >>>>>>> 752f0c0 (Featire specs) =======
    14. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
    15. 8 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) =======
    16. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
    17. 8 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    18. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    19. 1 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    20. 8 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
    21. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    22. 12 =======
    23. 12 >>>>>>> 9620751 (Featire specs) =======
    24. 8 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) =======
    25. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    26. 8 =======
    27. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    28. 8 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
    29. 1 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
    30. 8 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
    31. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
    32. 8 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
    33. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
    34. 12 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
    35. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    36. 8 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
    37. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    38. 8 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    39. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    40. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    41. 8 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    42. 1 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
    43. 8 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    44. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    45. 12 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) name { FFaker::Book.genre }
    46. end
    47. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) =======
    ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price)

    spec/factories/reviews.rb

    ======= ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) =======
    ======= ======= >>>>>>> bae2b7de (Add login registration pages)

    spec/factories/users.rb

    ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs)

    spec/factories/reviews.rb

    >>>>>>> 84003439 (Featire specs) =======

    spec/feature/book_spec.rb

    <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======

    spec/feature/book_spec.rb

    >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9d98d9ab (Featire specs) 5 relevant lines. 5 lines covered and ======= <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs)
    2. <<<<<<< HEAD <<<<<<< HEAD
    3. 1 ======= <<<<<<< HEAD
    4. 1 =======
    5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= =======
    6. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD factory :user do
    7. end
    8. end
    >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======

    spec/feature/book_spec.rb

    >>>>>>> d0dc1f1 (Featire specs) =======

    spec/feature/book_spec.rb

    >>>>>>> 752f0c0 (Featire specs) =======

    spec/feature/book_spec.rb

    >>>>>>> 4e81ea2 (Featire specs) =======

    spec/feature/book_spec.rb

    >>>>>>> 08edf50 (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 08edf50 (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    3. 1 =======
    4. >>>>>>> d0dc1f1 (Featire specs) =======
    5. >>>>>>> 752f0c0 (Featire specs) =======
    6. >>>>>>> 4e81ea2 (Featire specs) =======
    7. >>>>>>> 08edf50 (Featire specs) =======
    8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD factory :review do ======= <<<<<<< HEAD factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    9. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9d98d9ab (Featire specs) title { FFaker::Lorem.words(5) } ======= <<<<<<< HEAD title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    11. 1 rating { FFaker::Number.rand(0..5) }
    12. 1 body { FFaker::Lorem.words(500) }
    13. end
    14. end

    spec/factories/shippings.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :shipping do
    3. 1 user
    4. 1 address { FFaker::AddressUA.street_address }
    5. 1 city { FFaker::AddressUA.city }
    6. 1 zip { FFaker::AddressUA.zip_code }
    7. 1 country { FFaker::AddressUA.country }
    8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
    9. end
    10. end
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs)

    spec/factories/users.rb

    100.0% lines covered

    5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :user do
    3. 13 email { FFaker::Internet.email }
    4. 20 password { 'password' }
    5. 20 confirmed_at { Time.zone.now }
    6. end
    7. end
    <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    >>>>>>> 9bfbd88 (Featire specs)

    spec/factories/reviews.rb

    100.0% lines covered

    5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :review do
    3. 1 title { FFaker::Lorem.words(5) }
    4. 1 rating { FFaker::Number.rand(0..5) }
    5. 1 body { FFaker::Lorem.words(500) }
    6. end
    7. end

    spec/factories/shippings.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :shipping do
    3. 1 user
    4. 1 address { FFaker::AddressUA.street_address }
    5. 1 city { FFaker::AddressUA.city }
    6. 1 zip { FFaker::AddressUA.zip_code }
    7. 1 country { FFaker::AddressUA.country }
    8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
    9. end
    10. end
    >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased)

    spec/factories/users.rb

    <<<<<<< HEAD ======= ======= =======

    spec/factories/users.rb

    ======= =======

    spec/factories/users.rb

    ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD

    spec/factories/reviews.rb

    <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages)

    spec/factories/reviews.rb

    ======= <<<<<<< HEAD =======

    spec/factories/users.rb

    ======= <<<<<<< HEAD ======= =======

    spec/factories/users.rb

    ======= =======

    spec/factories/users.rb

    ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD

    spec/factories/reviews.rb

    <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages)

    spec/feature/book_spec.rb

    >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= =======

    spec/feature/book_spec.rb

    >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======

    spec/feature/book_spec.rb

    >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
    =======
    >>>>>>> 7c4ea7f (Fix)
    <<<<<<< HEAD

    spec/factories/reviews.rb

    ======= ======= >>>>>>> 7375d4b (Manifest_cache true) =======

    spec/factories/users.rb

    <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======

    spec/factories/users.rb

    <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======

    spec/factories/users.rb

    ======= =======

    spec/factories/users.rb

    <<<<<<< HEAD =======

    spec/factories/coupons.rb

    >>>>>>> 5b7749a (Fix) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased)

    spec/factories/reviews.rb

    >>>>>>> 11792758 (Rebased)

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :user do
    3. end
    4. end
    >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages)

    spec/feature/book_spec.rb

    >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= =======

    spec/feature/book_spec.rb

    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD 6 relevant lines. 6 lines covered and ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
    2. 1 factory :coupon do
    3. 4 code { SecureRandom.hex }
    4. 4 is_active { true }
    5. 4 active_till_date { FFaker::Time.datetime }
    6. 1 discount { rand(0..50) / 100 }
    7. end
    8. end

    spec/factories/order_books.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 4552227 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
    2. 1 factory :user do
    3. end
    4. end
    >>>>>>> e1f4d17 (Add login registration pages)

    spec/feature/book_spec.rb

    >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======

    spec/feature/book_spec.rb

    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) FactoryBot.define do
    2. 1 factory :user do
    3. end
    4. end
    >>>>>>> 730a8ca (Add login registration pages)

    spec/feature/book_spec.rb

    >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 11792758 (Rebased) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs)
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    3. 1 =======
    4. >>>>>>> d0dc1f1 (Featire specs) =======
    5. >>>>>>> 752f0c0 (Featire specs) =======
    6. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :user do
    7. end
    8. end
    >>>>>>> e1f4d17 (Add login registration pages)

    spec/feature/book_spec.rb

    >>>>>>> 7a02bbe (Featire specs) =======

    spec/feature/book_spec.rb

    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased) FactoryBot.define do
    2. 1 <<<<<<< HEAD factory :user do
    3. end
    4. end
    <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e5752db (Featire specs)

    spec/feature/book_spec.rb

    >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= =======

    spec/feature/book_spec.rb

    >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
    3. 1 =======
    4. >>>>>>> d0dc1f1 (Featire specs) =======
    5. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= =======
    6. >>>>>>> 4e81ea2 (Featire specs) =======
    7. >>>>>>> 08edf50 (Featire specs) =======
    8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    9. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= =======
    10. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= factory :review do >>>>>>> 11792758 (Rebased)
    11. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= title { FFaker::Lorem.words(5) } >>>>>>> 11792758 (Rebased)
    12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased)
    13. 1 rating { FFaker::Number.rand(0..5) }
    14. 1 body { FFaker::Lorem.words(500) }
    15. end
    16. end

    spec/factories/shippings.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :shipping do
    3. 1 user
    4. 1 address { FFaker::AddressUA.street_address }
    5. 1 city { FFaker::AddressUA.city }
    6. 1 zip { FFaker::AddressUA.zip_code }
    7. 1 country { FFaker::AddressUA.country }
    8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
    9. end
    10. end
    >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased)

    spec/factories/users.rb

    100.0% lines covered

    5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) factory :user do
    3. <<<<<<< HEAD <<<<<<< HEAD
    4. =======
    5. 1 =======
    6. 13 >>>>>>> 31d15e66 (Fix) email { FFaker::Internet.email }
    7. 20 password { 'password' }
    8. 20 confirmed_at { Time.zone.now }
    9. >>>>>>> 11792758 (Rebased) end
    10. <<<<<<< HEAD
    11. =======
    12. >>>>>>> 11792758 (Rebased) end
    <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs)

    spec/feature/book_spec.rb

    >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

    spec/feature/book_spec.rb

    >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

    spec/feature/book_spec.rb

    >>>>>>> 4e81ea2 (Featire specs) =======

    spec/feature/book_spec.rb

    >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> fc3774fd (Featire specs) 5 relevant lines. 5 lines covered and ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) FactoryBot.define do ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.define do >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= FactoryBot.define do >>>>>>> 5b7749a (Fix)
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
    3. 1 ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    4. 1 =======
    5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    6. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    7. >>>>>>> 4e81ea2 (Featire specs) =======
    8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) =======
    9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
    10. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
    11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
    12. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    13. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    14. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    15. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD factory :user do
    16. end
    17. end
    >>>>>>> e1f4d17 (Add login registration pages)

    spec/feature/book_spec.rb

    >>>>>>> 7a02bbe (Featire specs) =======

    spec/feature/book_spec.rb

    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
    2. 1 factory :user do
    3. end
    4. end
    >>>>>>> 730a8ca (Add login registration pages)

    spec/feature/book_spec.rb

    >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
    <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs)

    spec/factories/reviews.rb

    ======= ======= >>>>>>> 824bb2b (Featire specs) =======
    >>>>>>> c033601 (Rebased)

    spec/feature/admin/author_spec.rb

    <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased)

    100.0% lines covered

    <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> 9a49b7b (Rebased) 0 lines missed.
        
    1. 1 <<<<<<< HEAD FactoryBot.define do ======= RSpec.describe 'Author' do >>>>>>> 9a49b7b (Rebased)
    2. 1 <<<<<<< HEAD factory :review do ======= include_context 'with api request authentication helper methods' >>>>>>> 9a49b7b (Rebased)
    3. 1 <<<<<<< HEAD title { FFaker::Lorem.words(5) } ======= include_context 'with api request global before and after hooks' >>>>>>> 9a49b7b (Rebased) ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs)
    4. <<<<<<< HEAD <<<<<<< HEAD
    5. 1 rating { FFaker::Number.rand(0..5) }
    6. 1 body { FFaker::Lorem.words(500) }
    7. end
    8. end

    spec/factories/shippings.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :shipping do
    3. 1 user
    4. 1 address { FFaker::AddressUA.street_address }
    5. 1 city { FFaker::AddressUA.city }
    6. 1 zip { FFaker::AddressUA.zip_code }
    7. 1 country { FFaker::AddressUA.country }
    8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
    9. end
    10. end
    >>>>>>> aca90e3 (Rebased)

    spec/factories/users.rb

    >>>>>>> 11792758 (Rebased)

    100.0% lines covered

    5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :user do
    3. 13 email { FFaker::Internet.email }
    4. 20 password { 'password' }
    5. 20 confirmed_at { Time.zone.now }
    6. end
    7. end
    <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages)
    =======
    >>>>>>> aca90e3 (Rebased)
    <<<<<<< HEAD

    spec/feature/book_spec.rb

    >>>>>>> d0dc1f1 (Featire specs) =======

    spec/feature/book_spec.rb

    >>>>>>> 752f0c0 (Featire specs) =======

    spec/feature/book_spec.rb

    >>>>>>> 4e81ea2 (Featire specs) =======

    spec/feature/book_spec.rb

    >>>>>>> 08edf50 (Featire specs) =======

    spec/feature/admin/author_spec.rb

    >>>>>>> c7a726c5 (Rebased)

    =======

    spec/feature/admin/author_spec.rb

    ======= >>>>>>> 824bb2b (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) 5 relevant lines. 5 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
        
    1. 1 <<<<<<< HEAD FactoryBot.define do <<<<<<< HEAD ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 75fa7e1b (Rebased) ======= RSpec.describe 'Author' do >>>>>>> c7a726c5 (Rebased)
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
    3. 1 =======
    4. >>>>>>> d0dc1f1 (Featire specs) =======
    5. >>>>>>> 752f0c0 (Featire specs) =======
    6. >>>>>>> 4e81ea2 (Featire specs) =======
    7. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
    8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    9. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    10. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
    11. 1 >>>>>>> 75fa7e1b (Rebased) =======
    12. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= factory :review do >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) <<<<<<< HEAD factory :review do ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= factory :review do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= factory :order_book do >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= include_context 'with api request authentication helper methods' >>>>>>> c7a726c5 (Rebased)
    13. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= title { FFaker::Lorem.words(5) } >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) title { FFaker::Lorem.words(5) } ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= order >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= include_context 'with api request global before and after hooks' >>>>>>> c7a726c5 (Rebased)
    14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs)
    15. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    16. 1 =======
    17. ======= >>>>>>> 84003439 (Featire specs) =======
    18. 2 let(:first_name) { FFaker::Name.first_name }
    19. 2 let(:last_name) { FFaker::Name.last_name }
    20. 2 let(:new_name) { FFaker::Name.first_name }
    21. 2 let(:old_name) { author.first_name }
    22. 4 let(:author) { create(:author) }
    23. 1 before do
    24. 4 sign_in(create(:admin_user), :admin_user)
    25. end
    26. 1 it 'can create an author' do
    27. 1 visit 'admin/authors'
    28. 1 click_link('New Author')
    29. 1 fill_in 'author[first_name]', with: first_name
    30. 1 fill_in 'author[last_name]', with: last_name
    31. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
    32. end
    33. 1 it 'can delete an author' do
    34. 1 author
    35. 1 visit 'admin/authors'
    36. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
    37. end
    38. 1 it 'can view an author' do
    39. 1 author
    40. 1 visit 'admin/authors'
    41. 1 click_link('View')
    42. 1 expect(page).to have_content(author.first_name)
    43. end
    44. 1 it 'can edit an author' do
    45. 1 author
    46. 1 visit 'admin/authors'
    47. 1 click_link('Edit')
    48. 1 fill_in 'author[first_name]', with: new_name
    49. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
    50. end
    51. end

    spec/feature/admin/book_spec.rb

    100.0% lines covered

    43 relevant lines. 43 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Book' do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 7 let(:book) { create(:book) }
    5. 1 let(:params) do
    6. 1 { title: FFaker::Book.title,
    7. description: FFaker::Book.description,
    8. price_cents: FFaker::Number.rand(1..100),
    9. dimensions: FFaker::Book.cover,
    10. year_of_publication: FFaker::Number.rand(1900..2022),
    11. materials: 'Soft cover',
    12. quantity: FFaker::Number.rand(2..5) }
    13. end
    14. 1 before do
    15. 6 sign_in(create(:admin_user), :admin_user)
    16. 6 book
    17. 6 visit 'admin/books'
    18. end
    19. 1 it 'can create an category' do
    20. 1 click_link('New Book')
    21. 1 fill_in 'book[title]', with: params[:title]
    22. 1 fill_in 'book[description]', with: params[:description]
    23. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
    24. 1 fill_in 'book[price_cents]', with: params[:price_cents]
    25. 1 fill_in 'book[materials]', with: params[:materials]
    26. 1 fill_in 'book[dimensions]', with: params[:dimensions]
    27. 1 fill_in 'book[quantity]', with: params[:quantity]
    28. 1 click_button('Create Book')
    29. 1 expect(page).to have_content(params[:title])
    30. end
    31. 1 it 'can delete an book' do
    32. 1 click_link('Delete')
    33. 1 expect(page).not_to have_content(book.title)
    34. end
    35. 1 it 'can view an book' do
    36. 1 click_link('View')
    37. 1 expect(page).to have_content(book.title)
    38. end
    39. 1 it 'can edit an book' do
    40. 1 click_link('Edit')
    41. 1 fill_in 'book[title]', with: 'New title'
    42. 1 click_button('Update Book')
    43. 1 expect(page).to have_content('New title')
    44. end
    45. 1 context 'when image' do
    46. 1 before do
    47. 2 click_link('Edit')
    48. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
    49. 2 click_on 'Update Book'
    50. end
    51. 1 it 'can add images to book' do
    52. 1 expect(book.reload.images.count).to eq(1)
    53. end
    54. 1 it 'can delete images from book' do
    55. 1 click_link('Edit')
    56. 1 click_link('Delete')
    57. 1 expect(book.reload.images.count).to eq(0)
    58. end
    59. end
    60. end

    spec/feature/admin/category_spec.rb

    100.0% lines covered

    25 relevant lines. 25 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Category' do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 2 let(:category_name) { FFaker::Book.genre }
    5. 5 let(:category) { create(:category) }
    6. 1 before do
    7. 4 sign_in(create(:admin_user), :admin_user)
    8. 4 category
    9. 4 visit 'admin/categories'
    10. end
    11. 1 it 'can create an category' do
    12. 1 click_link('New Category')
    13. 1 fill_in 'category[name]', with: category_name
    14. 1 click_button('Create Category')
    15. 1 expect(page).to have_content(category_name)
    16. end
    17. 1 it 'can delete an category' do
    18. 1 click_link('Delete')
    19. 1 expect(page).not_to have_content(category.name)
    20. end
    21. 1 it 'can view an category' do
    22. 1 click_link('View')
    23. 1 expect(page).to have_content(category.name)
    24. end
    25. 1 it 'can edit an category' do
    26. 1 click_link('Edit')
    27. 1 fill_in 'category[name]', with: 'New Genre'
    28. 1 click_button('Update Category')
    29. 1 expect(page).to have_content('New Genre')
    30. end
    31. end

    spec/feature/billing_spec.rb

    73.08% lines covered

    26 relevant lines. 19 lines covered and 7 lines missed.
        
    1. 1 RSpec.describe 'Billing', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 2 let(:user) { create(:user) }
    5. 1 let(:attributes_for) { attributes_for(:billing) }
    6. 1 describe '#fill_in', js: true do
    7. 1 it 'fill in billing' do
    8. 1 sign_in(user)
    9. 1 visit edit_user_path(user.id)
    10. 1 within('div#billing.col-md-5.mb-40') do
    11. 1 find_all('div', class: 'form-group')[0] do
    12. fill_in :first_name, with: attributes_for[:first_name]
    13. end
    14. 1 find_all('div', class: 'form-group')[1] do
    15. fill_in :last_name, with: attributes_for[:last_name]
    16. end
    17. 1 find_all('div', class: 'form-group')[2] do
    18. fill_in :address, with: attributes_for[:address]
    19. end
    20. 1 find_all('div', class: 'form-group')[3] do
    21. fill_in :city, with: attributes_for[:city]
    22. end
    23. 1 find_all('div', class: 'form-group')[4] do
    24. fill_in :zip, with: attributes_for[:zip]
    25. end
    26. 1 find_all('div', class: 'form-group')[5] do
    27. fill_in :country, with: attributes_for[:country]
    28. end
    29. 1 find_all('div', class: 'form-group')[6] do
    30. fill_in :phone, with: attributes_for[:phone]
    31. end
    32. 1 click_on I18n.t('settings.save')
    33. end
    34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
    35. end
    36. end
    37. end

    spec/feature/book_spec.rb

    100.0% lines covered

    104 relevant lines. 104 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Book', type: :feature do
    2. 5 let(:category_one) { create(:category) }
    3. 3 let(:category_two) { create(:category) }
    4. 1 let(:params) do
    5. 4 { title: FFaker::Book.title,
    6. description: FFaker::Book.description,
    7. price_cents: FFaker::Number.rand(1..100),
    8. dimensions: FFaker::Book.cover,
    9. year_of_publication: FFaker::Number.rand(1900..2022),
    10. materials: 'Soft cover',
    11. quantity: FFaker::Number.rand(2..5) }
    12. end
    13. 7 let(:book) { create(:book).decorate }
    14. 1 describe '#show book' do
    15. 1 it 'show books info' do
    16. 1 visit "books/#{book.id}"
    17. 1 expect(page).to have_content(book.title)
    18. end
    19. 1 it 'clicked Beck to results' do
    20. 1 visit "books/#{book.id}"
    21. 1 find('a', class: 'general-back-link').click
    22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
    23. end
    24. 1 context 'when test read more' do
    25. 1 it 'show read more' do
    26. 1 visit "books/#{book.id}"
    27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
    28. end
    29. 1 it 'clicked read more', js: true do
    30. 1 visit "books/#{book.id}"
    31. 1 click_link I18n.t('book_page.read_more')
    32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
    33. end
    34. end
    35. 1 context 'when quantity changes', js: true do
    36. 1 before do
    37. 2 visit "books/#{book.id}"
    38. 2 find('a', class: 'inc').click
    39. end
    40. 1 it 'increase quantity' do
    41. 1 expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
    42. end
    43. 1 it 'decrease quantity' do
    44. 1 find('a', class: 'dec').click
    45. 1 expect(page).to have_content("€#{book.price}")
    46. end
    47. end
    48. end
    49. 1 describe '#catalog' do
    50. 1 describe 'filter by category' do
    51. 1 before do
    52. 2 category_one.books.create(params)
    53. 2 visit books_path
    54. end
    55. 1 after do
    56. 2 category_one.destroy
    57. end
    58. 1 it 'show book count for category' do
    59. 1 expect(page).to have_content(category_one.books.size)
    60. end
    61. 1 it 'filter book by category' do
    62. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
    63. 1 click_on category_one.name
    64. end
    65. 1 expect(page).to have_content(category_one.books.first.title)
    66. end
    67. end
    68. 1 describe 'filter by all books' do
    69. 1 before do
    70. 2 category_one.books.create(params)
    71. 2 category_two.books.create(params)
    72. 2 visit books_path
    73. 2 click_on I18n.t('catalog_page.all')
    74. end
    75. 1 after do
    76. 2 category_one.destroy
    77. 2 category_two.destroy
    78. end
    79. 1 it 'shown books for first category' do
    80. 1 expect(page).to have_content(category_one.books.first.title)
    81. end
    82. 1 it 'shown books for second category' do
    83. 1 expect(page).to have_content(category_two.books.first.title)
    84. end
    85. end
    86. end
    87. 1 describe 'load_more' do
    88. 1 before do
    89. 3 24.times do
    90. 72 books << create(:book)
    91. end
    92. end
    93. 4 let(:books) { [] }
    94. 1 it 'show books without view more button' do
    95. 1 visit books_path
    96. 1 find('a', id: 'view_more', class: 'view_more').click
    97. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
    98. end
    99. 1 context 'when view more' do
    100. 1 it 'show books with view more button' do
    101. 1 visit books_path
    102. 1 expect(page).to have_css('a', class: 'view_more')
    103. end
    104. 1 it 'show loaded books', js: true do
    105. 1 visit books_path
    106. 1 find('a', class: 'view_more').click
    107. 1 expect(page).to have_content(books.last.title)
    108. end
    109. end
    110. end
    111. 1 describe 'sort' do
    112. 1 shared_examples 'sort test' do
    113. 5 it 'sort books' do
    114. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
    115. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
    116. 5 create(:book, title: 'Anna', price_cents: 23,
    117. created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
    118. 5 visit books_path
    119. 5 find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
    120. id: 'menu').click
    121. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
    122. 5 click_link button
    123. end
    124. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
    125. end
    126. end
    127. 1 context 'when sort by title A to Z' do
    128. 2 let(:button) { I18n.t('catalog_page.sorting.title.asc') }
    129. 2 let(:book_title) { 'Anna' }
    130. 1 include_examples 'sort test'
    131. end
    132. 1 context 'when sort by title Z to A' do
    133. 2 let(:button) { I18n.t('catalog_page.sorting.title.desc') }
    134. 2 let(:book_title) { 'Zimbabwe' }
    135. 1 include_examples 'sort test'
    136. end
    137. 1 context 'when sort by price High to Low' do
    138. 2 let(:button) { I18n.t('catalog_page.sorting.price.desc') }
    139. 2 let(:book_title) { 'Zimbabwe' }
    140. 1 include_examples 'sort test'
    141. end
    142. 1 context 'when sort by price Low to High' do
    143. 2 let(:button) { I18n.t('catalog_page.sorting.price.asc') }
    144. 2 let(:book_title) { 'Anna' }
    145. 1 include_examples 'sort test'
    146. end
    147. 1 context 'when sort by newest' do
    148. 2 let(:button) { I18n.t('catalog_page.sorting.newer_first') }
    149. 2 let(:book_title) { 'Zimbabwe' }
    150. 1 include_examples 'sort test'
    151. end
    152. end
    153. end

    spec/feature/home_spec.rb

    100.0% lines covered

    49 relevant lines. 49 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Home', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 1 describe 'Get Started' do
    5. 1 it 'on click move to catalog page' do
    6. 1 visit root_path
    7. 1 click_on 'Get Started'
    8. 1 expect(page).to have_content('Catalog')
    9. end
    10. end
    11. 1 describe 'navbar' do
    12. 2 let(:books_category) { create(:books_category) }
    13. 1 it 'on click home move to root-path' do
    14. 1 visit books_path
    15. 1 find('a', id: 'root').click
    16. 1 expect(page).to have_content('Get Started')
    17. end
    18. 1 it 'on click category name move to root-path with books that belong to this category' do
    19. 1 books_category
    20. 1 visit root_path
    21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
    22. 1 within('ul', id: 'nav') do
    23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
    24. end
    25. 1 expect(page).to have_content(books_category.category.books.first.title)
    26. end
    27. 1 context 'when guest' do
    28. 1 it 'on click login go to login page' do
    29. 1 visit root_path
    30. 1 within 'div', class: 'visible-xs' do
    31. 1 click_link I18n.t('header.log_in')
    32. end
    33. 1 expect(page).to have_content(I18n.t('header.log_in'))
    34. end
    35. 1 it 'on click sing up go to sing up page' do
    36. 1 visit root_path
    37. 1 within 'div', class: 'visible-xs' do
    38. 1 click_link I18n.t('header.sing_up')
    39. end
    40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
    41. end
    42. end
    43. 1 context 'when user', js: true do
    44. 4 let(:user) { create(:user) }
    45. 1 before do
    46. 3 sign_in(user)
    47. end
    48. 1 it 'on click account show settings' do
    49. 1 visit root_path
    50. 1 click_on I18n.t('header.account')
    51. 1 expect(page).to have_content(I18n.t('header.settings'))
    52. end
    53. 1 it 'on click account show log_out' do
    54. 1 visit root_path
    55. 1 click_on I18n.t('header.account')
    56. 1 expect(page).to have_content(I18n.t('header.log_out'))
    57. end
    58. 1 it 'log_out' do
    59. 1 visit root_path
    60. 1 click_on I18n.t('header.account')
    61. 1 click_on(I18n.t('header.log_out'), match: :first)
    62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
    63. end
    64. end
    65. end
    66. end

    spec/feature/login_spec.rb

    >>>>>>> a5d032d (Fix) 100.0% lines covered

    <<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Login', type: :feature do
    2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
    3. 1 describe '#login' do
    4. 1 before do
    5. 2 visit new_user_session_path
    6. end
    7. 1 context 'when successfully login' do
    8. 1 it 'login' do
    9. 1 within 'form', class: 'new_user', id: 'new_user' do
    10. 1 fill_in 'user_email', with: user_second.email
    11. 1 fill_in 'user_password', with: user_second.password
    12. 1 click_on I18n.t('header.log_in')
    13. end
    14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
    15. end
    16. end
    17. 1 context 'when unsuccessfully login' do
    18. 1 it 'didn`t login' do
    19. 1 within 'form', class: 'new_user', id: 'new_user' do
    20. 1 fill_in 'user_email', with: user_second.email
    21. 1 fill_in 'user_password', with: 'wrong_password'
    22. 1 click_on I18n.t('header.log_in')
    23. end
    24. 1 expect(page).to have_text 'Invalid Email or password.'
    25. end
    26. end
    27. end
    28. end

    spec/feature/new_password_spec.rb

    100.0% lines covered

    13 relevant lines. 13 lines covered and 0 lines missed.
        
    1. 1 require_relative '../rails_helper'
    2. 1 require_relative '../support/shared_context'
    3. 1 RSpec.describe 'New Password', type: :feature do
    4. 3 let(:user) { FactoryBot.create(:user) }
    5. 1 describe '#new_password' do
    6. 1 it 'change password' do
    7. 1 user.reset_password('newPassword', 'newPassword')
    8. 1 expect(user.password).to eq('newPassword')
    9. end
    10. 1 it 'not validate password' do
    11. 1 visit new_user_password_path
    12. 1 fill_in 'email', with: user.email
    13. 1 click_on I18n.t('login.send_instructions')
    14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
    15. end
    16. end
    17. end

    spec/feature/registration_spec.rb

    100.0% lines covered

    29 relevant lines. 29 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Registration', type: :feature do
    2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
    3. 1 describe '#sing_up' do
    4. 1 before do
    5. 3 visit new_user_registration_path
    6. end
    7. 1 context 'when successfully sing_up' do
    8. 1 it 'sing_up users' do
    9. 1 within 'form', class: 'new_user', id: 'new_user' do
    10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
    11. 1 fill_in 'user_password', with: user.password
    12. 1 fill_in 'user_password_confirmation', with: user.password
    13. 1 click_on I18n.t('header.sing_up')
    14. end
    15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
    16. end
    17. end
    18. 1 context 'when users is already exits' do
    19. 1 it 'sing_up users' do
    20. 1 within 'form', class: 'new_user', id: 'new_user' do
    21. 1 fill_in 'user_email', with: user.email
    22. 1 fill_in 'user_password', with: user.password
    23. 1 fill_in 'user_password_confirmation', with: user.password
    24. 1 click_on I18n.t('header.sing_up')
    25. end
    26. 1 expect(page).to have_text('Email has already been taken')
    27. end
    28. end
    29. 1 context 'when unsuccessfully sing_up' do
    30. 1 it 'didn`t sing_up' do
    31. 1 within 'form', class: 'new_user', id: 'new_user' do
    32. 1 fill_in 'user_email', with: FFaker::Internet.email
    33. 1 fill_in 'user_password', with: 'password'
    34. 1 fill_in 'user_password_confirmation', with: 'wrong'
    35. 1 click_on I18n.t('header.sing_up')
    36. end
    37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
    38. end
    39. end
    40. end
    41. end

    spec/feature/review_spec.rb

    100.0% lines covered

    28 relevant lines. 28 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Review', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 3 let(:user) { create(:user).decorate }
    5. 3 let(:book) { create(:book).decorate }
    6. 1 before do
    7. 2 sign_in(user)
    8. 2 visit book_path(book)
    9. end
    10. 1 shared_examples 'review' do
    11. 2 it 'review' do
    12. 2 find('i', id: rating).click
    13. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
    14. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
    15. 2 click_on I18n.t('review.post')
    16. 2 expect(page).to have_content(result)
    17. end
    18. end
    19. 1 describe '#post review', js: true do
    20. 1 context 'when review posted' do
    21. 2 let(:rating) { "star#{rand(1..5)}" }
    22. 2 let(:title_words) { 3 }
    23. 2 let(:body_words) { 5 }
    24. 2 let(:result) { user.name_or_email }
    25. 1 include_examples 'review'
    26. end
    27. 1 context 'when review not been posted' do
    28. 2 let(:rating) { "star#{rand(1..5)}" }
    29. 2 let(:title_words) { 80 }
    30. 2 let(:body_words) { 30 }
    31. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
    32. 1 include_examples 'review'
    33. end
    34. end
    35. end

    spec/feature/settings_spec.rb

    100.0% lines covered

    34 relevant lines. 34 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Settings', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 4 let(:user) { create(:user) }
    5. 1 before do
    6. 3 sign_in(user)
    7. 3 visit edit_user_path(user.id)
    8. 3 click_link I18n.t('settings.privacy')
    9. end
    10. 1 describe '#email_change' do
    11. 1 it 'change email' do
    12. 1 within('div', id: 'email') do
    13. 1 fill_in :email, with: FFaker::Internet.email
    14. 1 click_on I18n.t('settings.save')
    15. end
    16. 1 user.confirm
    17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
    18. end
    19. end
    20. 1 describe '#password_change' do
    21. 1 context 'when error' do
    22. 1 it 'didnt change password' do
    23. 1 within('div', id: 'password') do
    24. 1 fill_in :current_password, with: user.password
    25. 1 fill_in :password, with: 'newPassword'
    26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
    27. 1 click_on I18n.t('settings.save')
    28. end
    29. 1 user.confirm
    30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
    31. end
    32. end
    33. 1 context 'when successful' do
    34. 1 it 'didnt change password' do
    35. 1 within('div', id: 'password') do
    36. 1 fill_in :current_password, with: user.password
    37. 1 fill_in :password, with: 'newPassword'
    38. 1 fill_in :password_confirmation, with: 'newPassword'
    39. 1 click_on I18n.t('settings.save')
    40. end
    41. 1 user.confirm
    42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
    43. end
    44. end
    45. end
    46. end

    spec/feature/shipping_spec.rb

    73.08% lines covered

    26 relevant lines. 19 lines covered and 7 lines missed.
        
    1. 1 RSpec.describe 'Shipping', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 2 let(:user) { FactoryBot.create(:user) }
    5. 1 let(:attributes_for) { attributes_for(:shipping) }
    6. 1 describe '#fill_in', js: true do
    7. 1 it 'fill in shipping' do
    8. 1 sign_in(user)
    9. 1 visit edit_user_path(user.id)
    10. 1 within('div#shipping.col-md-5.mb-40') do
    11. 1 find_all('div', class: 'form-group')[0] do
    12. fill_in :first_name, with: attributes_for[:first_name]
    13. end
    14. 1 find_all('div', class: 'form-group')[1] do
    15. fill_in :last_name, with: attributes_for[:last_name]
    16. end
    17. 1 find_all('div', class: 'form-group')[2] do
    18. fill_in :address, with: attributes_for[:address]
    19. end
    20. 1 find_all('div', class: 'form-group')[3] do
    21. fill_in :city, with: attributes_for[:city]
    22. end
    23. 1 find_all('div', class: 'form-group')[4] do
    24. fill_in :zip, with: attributes_for[:zip]
    25. end
    26. 1 find_all('div', class: 'form-group')[5] do
    27. fill_in :country, with: attributes_for[:country]
    28. end
    29. 1 find_all('div', class: 'form-group')[6] do
    30. fill_in :phone, with: attributes_for[:phone]
    31. end
    32. 1 click_on I18n.t('settings.save')
    33. end
    34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
    35. end
    36. end
    37. end

    spec/feature/user_spec.rb

    100.0% lines covered

    42 relevant lines. 42 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'User', type: :feature do
    2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
    3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
    4. 1 describe '#sing_up' do
    5. 1 context 'when successfully sing_up' do
    6. 1 before do
    7. 1 visit new_user_registration_path
    8. 1 within 'form', class: 'new_user', id: 'new_user' do
    9. 1 fill_in 'user_email', with: user.email
    10. 1 fill_in 'user_password', with: user.password
    11. 1 fill_in 'user_password_confirmation', with: user.password
    12. 1 click_on I18n.t('header.sing_up')
    13. end
    14. end
    15. 1 it 'sing_up user' do
    16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
    17. end
    18. end
    19. 1 context 'when unsuccessfully sing_up' do
    20. 1 it 'didn`t sing_up' do
    21. 1 visit new_user_registration_path
    22. 1 within 'form', class: 'new_user', id: 'new_user' do
    23. 1 fill_in 'user_email', with: FFaker::Internet.email
    24. 1 fill_in 'user_password', with: 'wrong'
    25. 1 fill_in 'user_password_confirmation', with: 'wrong'
    26. 1 click_on I18n.t('header.sing_up')
    27. end
    28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
    29. end
    30. end
    31. end
    32. 1 describe '#login' do
    33. 1 before do
    34. 2 user_second.confirm
    35. end
    36. 1 context 'when successfully login' do
    37. 1 it 'login' do
    38. 1 visit new_user_session_path
    39. 1 within 'form', class: 'new_user', id: 'new_user' do
    40. 1 fill_in 'user_email', with: user_second.email
    41. 1 fill_in 'user_password', with: user_second.password
    42. 1 click_on I18n.t('header.log_in')
    43. end
    44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
    45. end
    46. end
    47. 1 context 'when unsuccessfully login' do
    48. 1 it 'didn`t login' do
    49. 1 visit new_user_session_path
    50. 1 within 'form', class: 'new_user', id: 'new_user' do
    51. 1 fill_in 'user_email', with: user_second.email
    52. 1 fill_in 'user_password', with: 'wrong_password'
    53. 1 click_on I18n.t('header.log_in')
    54. end
    55. 1 expect(page).to have_text 'Invalid Email or password.'
    56. end
    57. end
    58. end
    59. end

    spec/models/admin_user_spec.rb

    100.0% lines covered

    5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AdminUser, type: :model do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:email) }
    5. 2 it { is_expected.to validate_presence_of(:password) }
    6. end
    7. end

    spec/models/author_spec.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Author, type: :model do
    2. 1 describe 'author' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:first_name) }
    5. 2 it { is_expected.to validate_presence_of(:last_name) }
    6. end
    7. 1 context 'when associations' do
    8. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
    9. 2 it { is_expected.to have_many(:books).through(:authors_books) }
    10. end
    11. end
    12. end

    spec/models/authors_book_spec.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe AuthorsBook, type: :model do
    2. 1 describe 'authors_book' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:book) }
    5. 2 it { is_expected.to validate_presence_of(:author) }
    6. end
    7. 1 context 'when associations' do
    8. 2 it { is_expected.to belong_to(:author) }
    9. 2 it { is_expected.to belong_to(:book) }
    10. end
    11. end
    12. end

    spec/models/billing_spec.rb

    100.0% lines covered

    20 relevant lines. 20 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Billing, type: :model do
    2. 1 describe 'billing' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
    5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
    6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
    7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
    8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
    9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
    10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
    11. end
    12. 1 context 'when not validations' do
    13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
    14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
    15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
    16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
    17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
    18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
    19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
    20. end
    21. 1 context 'when associations' do
    22. 2 it { is_expected.to belong_to(:user) }
    23. end
    24. end
    25. end

    spec/models/book_spec.rb

    100.0% lines covered

    16 relevant lines. 16 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Book, type: :model do
    2. 1 describe 'books' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:title) }
    5. 2 it { is_expected.to validate_presence_of(:description) }
    6. 2 it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
    7. 2 it { is_expected.to validate_presence_of(:year_of_publication) }
    8. 2 it { is_expected.to validate_presence_of(:quantity) }
    9. 2 it { is_expected.to validate_presence_of(:materials) }
    10. 2 it { is_expected.to validate_presence_of(:dimensions) }
    11. end
    12. 1 context 'when associations' do
    13. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
    14. 2 it { is_expected.to have_many(:authors).through(:authors_books) }
    15. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
    16. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
    17. 2 it { is_expected.to have_many(:reviews).dependent(:destroy) }
    18. end
    19. end
    20. end

    spec/models/books_category_spec.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe BooksCategory, type: :model do
    2. 1 describe 'books_categories' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:book) }
    5. 2 it { is_expected.to validate_presence_of(:category) }
    6. end
    7. 1 context 'when associations' do
    8. 2 it { is_expected.to belong_to(:category) }
    9. 2 it { is_expected.to belong_to(:book) }
    10. end
    11. end
    12. end

    spec/models/category_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Category, type: :model do
    2. 1 describe 'category' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:name) }
    5. end
    6. 1 context 'when associations' do
    7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
    8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
    9. end
    10. end
    11. end

    spec/models/review_spec.rb

    100.0% lines covered

    14 relevant lines. 14 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe Review, type: :model do
    3. 1 describe 'review' do
    4. 1 context 'when validations' do
    5. 2 it { is_expected.to validate_presence_of(:title) }
    6. 2 it { is_expected.to validate_presence_of(:body) }
    7. 2 it { is_expected.to validate_presence_of(:rating) }
    8. 2 it { is_expected.to validate_presence_of(:verified) }
    9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
    10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
    11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
    12. end
    13. 1 context 'when associations' do
    14. 2 it { is_expected.to belong_to(:book) }
    15. 2 it { is_expected.to belong_to(:user) }
    16. end
    17. end
    18. end

    spec/models/shipping_spec.rb

    100.0% lines covered

    20 relevant lines. 20 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Shipping, type: :model do
    2. 1 describe 'shipping' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
    5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
    6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
    7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
    8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
    9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
    10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
    11. end
    12. 1 context 'when not validations' do
    13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
    14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
    15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
    16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
    17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
    18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
    19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
    20. end
    21. 1 context 'when associations' do
    22. 2 it { is_expected.to belong_to(:user) }
    23. end
    24. end
    25. end

    spec/models/user_spec.rb

    100.0% lines covered

    9 relevant lines. 9 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe User, type: :model do
    2. 1 let(:user) { FactoryBot.create(:user) }
    3. 1 describe 'author' do
    4. 1 context 'when validations' do
    5. 2 it { is_expected.to validate_presence_of(:email) }
    6. 2 it { is_expected.to validate_presence_of(:password) }
    7. end
    8. 1 context 'with associations' do
    9. 2 it { is_expected.to have_one(:billing) }
    10. 2 it { is_expected.to have_one(:shipping) }
    11. end
    12. end
    13. end

    spec/queryes/book_query_spec.rb

    100.0% lines covered

    45 relevant lines. 45 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe BookQuery do
    3. 1 shared_examples 'sort test' do
    4. 5 it 'sort' do
    5. 5 books
    6. 5 expect(test).to eq(result)
    7. end
    8. end
    9. 3 let(:titles) { %w[Adam Zimbabwe] }
    10. 1 let(:books_dates) do
    11. 1 ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
    12. end
    13. 1 describe 'all books sort' do
    14. 1 context 'when sort by title A to Z' do
    15. 1 let(:books) do
    16. 1 create(:book, title: titles.first)
    17. 1 create(:book, title: titles.second)
    18. end
    19. 2 let(:result) { titles.second }
    20. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
    21. 1 include_examples 'sort test'
    22. end
    23. 1 context 'when sort title Z to A' do
    24. 1 let(:books) do
    25. 1 create(:book, title: titles.first)
    26. 1 create(:book, title: titles.second)
    27. end
    28. 2 let(:result) { titles.first }
    29. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
    30. 1 include_examples 'sort test'
    31. end
    32. 1 context 'when sort by price High to Low' do
    33. 1 let(:books) do
    34. 1 create(:book, price_cents: 75)
    35. 1 create(:book, price_cents: 23)
    36. end
    37. 2 let(:result) { 75 }
    38. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
    39. 1 include_examples 'sort test'
    40. end
    41. 1 context 'when sort price Low to High' do
    42. 1 let(:books) do
    43. 1 create(:book, price_cents: 75)
    44. 1 create(:book, price_cents: 23)
    45. end
    46. 2 let(:result) { 23 }
    47. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
    48. 1 include_examples 'sort test'
    49. end
    50. 1 context 'when sort by Newest' do
    51. 1 let(:books) do
    52. 1 create(:book, created_at: books_dates.first)
    53. 1 create(:book, created_at: books_dates.second)
    54. end
    55. 2 let(:result) { books_dates.first }
    56. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
    57. 1 include_examples 'sort test'
    58. end
    59. end
    60. end

    spec/support/configs/capybara.rb

    100.0% lines covered

    19 relevant lines. 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed.
        
    1. 1 RSpec.describe 'Author' do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. ======= >>>>>>> 824bb2b (Featire specs)
    5. 2 let(:first_name) { FFaker::Name.first_name }
    6. 2 let(:last_name) { FFaker::Name.last_name }
    7. 2 let(:new_name) { FFaker::Name.first_name }
    8. 2 let(:old_name) { author.first_name }
    9. 4 let(:author) { create(:author) }
    10. 1 before do
    11. 4 sign_in(create(:admin_user), :admin_user)
    12. end
    13. 1 it 'can create an author' do
    14. 1 visit 'admin/authors'
    15. 1 click_link('New Author')
    16. 1 fill_in 'author[first_name]', with: first_name
    17. 1 fill_in 'author[last_name]', with: last_name
    18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
    19. end
    20. 1 it 'can delete an author' do
    21. 1 author
    22. 1 visit 'admin/authors'
    23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
    24. end
    25. 1 it 'can view an author' do
    26. 1 author
    27. 1 visit 'admin/authors'
    28. 1 click_link('View')
    29. 1 expect(page).to have_content(author.first_name)
    30. end
    31. 1 it 'can edit an author' do
    32. 1 author
    33. 1 visit 'admin/authors'
    34. 1 click_link('Edit')
    35. 1 fill_in 'author[first_name]', with: new_name
    36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
    37. end
    38. end

    spec/feature/admin/book_spec.rb

    100.0% lines covered

    32 relevant lines. 32 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Book' do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. >>>>>>> c7a726c5 (Rebased) 5 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    5. 5 >>>>>>> 752f0c0 (Featire specs) =======
    6. 5 >>>>>>> 4e81ea2 (Featire specs) =======
    7. <<<<<<< HEAD 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    8. 5 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    9. 5 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    10. 5 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    11. 5 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    12. 5 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    13. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= book
    14. ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= =======
    15. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
    16. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= =======
    17. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======
    18. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 5 <<<<<<< HEAD <<<<<<< HEAD quantity { 1 } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) let(:book) { create(:book) } ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= let(:book) { create(:book) } ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) let(:category_one) { FactoryBot.create(:category) } >>>>>>> 610b6138 (Featire specs)
    19. end
    20. end

    spec/factories/orders.rb

    77.78% lines covered

    9 relevant lines. 7 lines covered and 2 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :order do
    3. 5 status { 'created' }
    4. 1 transient do
    5. 1 books_count { 1 }
    6. end
    7. 1 after :create do |order, books_count|
    8. 4 order.books do
    9. Array.new(books_count) do
    10. association(:order, books: [instance])
    11. end
    12. end
    13. end
    14. end
    15. end

    spec/factories/reviews.rb

    100.0% lines covered

    5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :review do
    3. 1 title { FFaker::Lorem.words(5) }
    4. 1 rating { FFaker::Number.rand(0..5) } >>>>>>> 5b7749a (Fix)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    6. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    7. 1 =======
    8. 3 <<<<<<< HEAD ======= let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) =======
    9. 3 >>>>>>> 752f0c0 (Featire specs) =======
    10. 3 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
    11. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    12. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= =======
    13. 3 >>>>>>> 7a02bbe (Featire specs) =======
    14. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
    15. 3 >>>>>>> 4552227 (Featire specs) =======
    16. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) =======
    17. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) body { FFaker::Lorem.words(500) }
    18. end
    19. end

    spec/factories/shippings.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :shipping do
    3. 1 user
    4. 1 address { FFaker::AddressUA.street_address }
    5. 1 city { FFaker::AddressUA.city }
    6. 1 zip { FFaker::AddressUA.zip_code }
    7. 1 country { FFaker::AddressUA.country }
    8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
    9. end
    10. end
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

    spec/factories/users.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :user do
    3. <<<<<<< HEAD <<<<<<< HEAD
    4. =======
    5. 1 =======
    6. 13 >>>>>>> 67ab5299 (Fix) email { FFaker::Internet.email }
    7. 20 password { 'password' }
    8. 20 confirmed_at { Time.zone.now }
    9. >>>>>>> 75fa7e1b (Rebased) end
    10. end
    <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs)

    spec/factories/reviews.rb

    ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs)

    spec/factories/reviews.rb

    ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    >>>>>>> c033601 (Rebased)

    spec/feature/admin/author_spec.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= =======

    =======

    spec/feature/admin/author_spec.rb

    >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> 9a49b7b (Rebased) ======= 31 relevant lines. 31 lines covered and >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD FactoryBot.define do ======= <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= RSpec.describe 'Author' do >>>>>>> 9a49b7b (Rebased) ======= RSpec.describe 'Author' do >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    2. 1 <<<<<<< HEAD factory :review do ======= <<<<<<< HEAD <<<<<<< HEAD factory :review do ======= include_context 'with api request authentication helper methods' >>>>>>> 9a49b7b (Rebased) ======= include_context 'with api request authentication helper methods' >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    3. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) title { FFaker::Lorem.words(5) } <<<<<<< HEAD ======= ======= include_context 'with api request global before and after hooks' >>>>>>> 9a49b7b (Rebased) ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= title { FFaker::Lorem.words(5) } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> 4bf888bf (Featire specs)
    4. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs)
    5. 1 =======
    6. 5 >>>>>>> d0dc1f1 (Featire specs) =======
    7. 5 >>>>>>> 752f0c0 (Featire specs) =======
    8. 5 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs)
    9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    10. 1 =======
    11. 3 >>>>>>> d0dc1f1 (Featire specs) =======
    12. 3 >>>>>>> 752f0c0 (Featire specs) =======
    13. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) body { FFaker::Lorem.words(500) }
    14. end
    15. end

    spec/factories/shippings.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :shipping do
    3. 1 user
    4. 1 address { FFaker::AddressUA.street_address }
    5. 1 city { FFaker::AddressUA.city }
    6. 1 zip { FFaker::AddressUA.zip_code }
    7. 1 country { FFaker::AddressUA.country }
    8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
    9. end
    10. end
    >>>>>>> aca90e3 (Rebased)

    spec/factories/users.rb

    100.0% lines covered

    5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 FactoryBot.define do
    2. 1 factory :user do
    3. 17 email { FFaker::Internet.email }
    4. 24 password { 'password' }
    5. 24 confirmed_at { Time.zone.now }
    6. end
    7. end
    <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD
    =======
    >>>>>>> aca90e3 (Rebased)

    spec/feature/admin/author_spec.rb

    ======= >>>>>>> 0d6dd12 (Manifest_cache true)

    =======

    spec/feature/admin/author_spec.rb

    <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true)

    100.0% lines covered

    31 relevant lines. 31 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Author' do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true)
    5. 2 let(:first_name) { FFaker::Name.first_name }
    6. 2 let(:last_name) { FFaker::Name.last_name }
    7. 2 let(:new_name) { FFaker::Name.first_name }
    8. 2 let(:old_name) { author.first_name }
    9. 4 let(:author) { create(:author) }
    10. 1 before do
    11. 4 sign_in(create(:admin_user), :admin_user)
    12. end
    13. 1 it 'can create an author' do
    14. 1 visit 'admin/authors'
    15. 1 click_link('New Author')
    16. 1 fill_in 'author[first_name]', with: first_name
    17. 1 fill_in 'author[last_name]', with: last_name
    18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
    19. end
    20. 1 it 'can delete an author' do
    21. 1 author
    22. 1 visit 'admin/authors'
    23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
    24. end
    25. 1 it 'can view an author' do
    26. 1 author
    27. 1 visit 'admin/authors'
    28. 1 click_link('View')
    29. 1 expect(page).to have_content(author.first_name)
    30. end
    31. 1 it 'can edit an author' do
    32. 1 author
    33. 1 visit 'admin/authors'
    34. 1 click_link('Edit')
    35. 1 fill_in 'author[first_name]', with: new_name
    36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
    37. end
    38. end

    spec/feature/admin/book_spec.rb

    100.0% lines covered

    43 relevant lines. 43 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Book' do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 7 let(:book) { create(:book) } <<<<<<< HEAD ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= include_context 'with api request global before and after hooks'
    5. 2 let(:first_name) { FFaker::Name.first_name }
    6. 2 let(:last_name) { FFaker::Name.last_name }
    7. 2 let(:new_name) { FFaker::Name.first_name }
    8. 2 let(:old_name) { author.first_name }
    9. 4 let(:author) { create(:author) }
    10. 1 before do
    11. 4 sign_in(create(:admin_user), :admin_user)
    12. end
    13. 1 it 'can create an author' do
    14. 1 visit 'admin/authors'
    15. 1 click_link('New Author')
    16. 1 fill_in 'author[first_name]', with: first_name
    17. 1 fill_in 'author[last_name]', with: last_name
    18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
    19. end
    20. 1 it 'can delete an author' do
    21. 1 author
    22. 1 visit 'admin/authors'
    23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
    24. end
    25. 1 it 'can view an author' do
    26. 1 author
    27. 1 visit 'admin/authors'
    28. 1 click_link('View')
    29. 1 expect(page).to have_content(author.first_name)
    30. end
    31. 1 it 'can edit an author' do
    32. 1 author
    33. 1 visit 'admin/authors'
    34. 1 click_link('Edit')
    35. 1 fill_in 'author[first_name]', with: new_name
    36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
    37. end
    38. end

    spec/feature/admin/book_spec.rb

    100.0% lines covered

    43 relevant lines. 43 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Book' do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 7 let(:book) { create(:book) } <<<<<<< HEAD ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= let(:book) { create(:book) } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    5. 1 let(:params) do
    6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    7. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    8. 1 =======
    9. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) =======
    10. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
    11. 4 >>>>>>> 4e81ea2 (Featire specs) =======
    12. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    13. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
    14. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
    15. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    16. 4 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    17. 4 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    18. 1 >>>>>>> 5b7749a (Fix) =======
    19. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) { title: FFaker::Book.title,
    20. description: FFaker::Book.description,
    21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= price_cents: FFaker::Number.rand(1..100), >>>>>>> 5b7749a (Fix) ======= price_cents: FFaker::Number.rand(1..100), >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    22. dimensions: FFaker::Book.cover,
    23. year_of_publication: FFaker::Number.rand(1900..2022),
    24. materials: 'Soft cover',
    25. quantity: FFaker::Number.rand(2..5) }
    26. end
    27. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
    28. 1 before do
    29. <<<<<<< HEAD
    30. 6 =======
    31. 4 >>>>>>> c7a726c5 (Rebased) sign_in(create(:admin_user), :admin_user)
    32. <<<<<<< HEAD
    33. 6 =======
    34. 4 >>>>>>> c7a726c5 (Rebased) book
    35. <<<<<<< HEAD
    36. 6 =======
    37. 4 >>>>>>> c7a726c5 (Rebased) visit 'admin/books'
    38. end
    39. 1 <<<<<<< HEAD it 'can create an book' do ======= it 'can create an category' do >>>>>>> c7a726c5 (Rebased)
    40. 1 click_link('New Book')
    41. 1 fill_in 'book[title]', with: params[:title]
    42. 1 fill_in 'book[description]', with: params[:description]
    43. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication] <<<<<<< HEAD
    44. 1 fill_in 'book[price_cents]', with: params[:price_cents]
    45. 1 fill_in 'book[materials]', with: params[:materials]
    46. 1 fill_in 'book[dimensions]', with: params[:dimensions]
    47. 1 fill_in 'book[quantity]', with: params[:quantity]
    48. 1 click_button('Create Book')
    49. 1 expect(page).to have_content(params[:title])
    50. end
    51. 1 it 'can delete an book' do
    52. 1 click_link('Delete')
    53. 1 expect(page).not_to have_content(book.title)
    54. end
    55. 1 it 'can view an book' do
    56. 1 click_link('View')
    57. 1 expect(page).to have_content(book.title)
    58. end
    59. 1 it 'can edit an book' do
    60. 1 click_link('Edit')
    61. 1 fill_in 'book[title]', with: 'New title'
    62. 1 click_button('Update Book')
    63. 1 expect(page).to have_content('New title')
    64. end
    65. 1 context 'when image' do
    66. 1 before do
    67. 2 click_link('Edit')
    68. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
    69. 2 click_on 'Update Book'
    70. end
    71. 1 it 'can add images to book' do
    72. 1 expect(book.reload.images.count).to eq(1)
    73. end
    74. 1 it 'can delete images from book' do
    75. 1 click_link('Edit')
    76. 1 click_link('Delete')
    77. 1 expect(book.reload.images.count).to eq(0)
    78. end
    79. end
    80. end

    spec/feature/admin/category_spec.rb

    100.0% lines covered

    25 relevant lines. 25 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Category' do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 2 let(:category_name) { FFaker::Book.genre }
    5. 5 let(:category) { create(:category) }
    6. 1 before do
    7. 4 sign_in(create(:admin_user), :admin_user)
    8. 4 category
    9. 4 visit 'admin/categories'
    10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    11. 7 >>>>>>> d0dc1f1 (Featire specs) =======
    12. 7 >>>>>>> 752f0c0 (Featire specs) =======
    13. 7 >>>>>>> 4e81ea2 (Featire specs) =======
    14. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    15. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    16. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    17. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    18. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    19. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
    20. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can create an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) ======= describe '#show book' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe '#show book' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe '#show book' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can create an category' do >>>>>>> 5b7749a (Fix)
    21. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('New Category') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books info' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show books info' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show books info' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('New Category') >>>>>>> 5b7749a (Fix)
    22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    23. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    24. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    25. 1 visit "books/#{book.id}"
    26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    27. >>>>>>> 5b7749a (Fix)
    28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    29. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    30. =======
    31. >>>>>>> d0dc1f1 (Featire specs) =======
    32. >>>>>>> 752f0c0 (Featire specs) =======
    33. >>>>>>> 4e81ea2 (Featire specs) =======
    34. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    36. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    38. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    39. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    40. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    41. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(book.title) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= fill_in 'category[name]', with: category_name >>>>>>> 5b7749a (Fix)
    42. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    43. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    44. =======
    45. >>>>>>> d0dc1f1 (Featire specs) =======
    46. >>>>>>> 752f0c0 (Featire specs) =======
    47. >>>>>>> 4e81ea2 (Featire specs) =======
    48. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    50. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    51. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    52. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    53. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    54. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    55. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    56. 1 click_button('Create Category') <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    57. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category_name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'clicked Beck to results' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(category_name) >>>>>>> 5b7749a (Fix)
    58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    59. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    60. =======
    61. 1 >>>>>>> d0dc1f1 (Featire specs) =======
    62. 1 >>>>>>> 752f0c0 (Featire specs) =======
    63. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    64. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    65. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    66. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    67. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    68. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    69. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    70. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
    71. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can delete an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can delete an category' do >>>>>>> 5b7749a (Fix)
    72. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    73. 1 click_link('Delete')
    74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    75. >>>>>>> d0dc1f1 (Featire specs) =======
    76. >>>>>>> 752f0c0 (Featire specs) =======
    77. >>>>>>> 4e81ea2 (Featire specs) =======
    78. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    79. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    81. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    82. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    83. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    84. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    85. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    86. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    87. =======
    88. >>>>>>> d0dc1f1 (Featire specs) =======
    89. >>>>>>> 752f0c0 (Featire specs) =======
    90. >>>>>>> 4e81ea2 (Featire specs) =======
    91. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    92. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    93. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    94. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    95. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    96. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    97. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    98. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content('Catalog') ======= >>>>>>> c7a726c5 (Rebased)
    99. 1 <<<<<<< HEAD end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content(category.name) >>>>>>> 5b7749a (Fix) ======= fill_in 'book[price_cents]', with: params[:price_cents] >>>>>>> c7a726c5 (Rebased)
    100. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix) ======= fill_in 'book[materials]', with: params[:materials] >>>>>>> c7a726c5 (Rebased)
    101. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    102. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    103. =======
    104. 1 >>>>>>> d0dc1f1 (Featire specs) =======
    105. 1 >>>>>>> 752f0c0 (Featire specs) =======
    106. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    107. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    108. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    109. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    110. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    111. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    112. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    113. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when test read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when test read more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= fill_in 'book[dimensions]', with: params[:dimensions] >>>>>>> c7a726c5 (Rebased)
    114. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can view an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show read more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can view an category' do >>>>>>> 5b7749a (Fix) ======= fill_in 'book[quantity]', with: params[:quantity]
    115. 1 click_button('Create Book')
    116. 1 expect(page).to have_content(params[:title])
    117. end
    118. 1 it 'can delete an book' do
    119. 1 click_link('Delete')
    120. 1 expect(page).not_to have_content(book.title)
    121. end
    122. 1 it 'can view an book' do
    123. 1 click_link('View')
    124. 1 expect(page).to have_content(book.title)
    125. end
    126. 1 it 'can edit an book' do
    127. 1 click_link('Edit')
    128. 1 fill_in 'book[title]', with: 'New title'
    129. 1 click_button('Update Book')
    130. 1 expect(page).to have_content('New title')
    131. end
    132. end

    spec/feature/admin/category_spec.rb

    100.0% lines covered

    25 relevant lines. 25 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Category' do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 2 let(:category_name) { FFaker::Book.genre }
    5. 5 let(:category) { create(:category) }
    6. 1 before do
    7. 4 sign_in(create(:admin_user), :admin_user)
    8. 4 category
    9. 4 visit 'admin/categories'
    10. end
    11. 1 it 'can create an category' do
    12. 1 click_link('New Category')
    13. 1 fill_in 'category[name]', with: category_name
    14. 1 click_button('Create Category')
    15. 1 expect(page).to have_content(category_name)
    16. end
    17. 1 it 'can delete an category' do
    18. 1 click_link('Delete')
    19. 1 expect(page).not_to have_content(category.name)
    20. end
    21. 1 it 'can view an category' do >>>>>>> c7a726c5 (Rebased)
    22. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('View') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('View') >>>>>>> 5b7749a (Fix) ======= click_link('View') >>>>>>> c7a726c5 (Rebased)
    23. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category.name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content('Read More') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(category.name) >>>>>>> 5b7749a (Fix) ======= expect(page).to have_content(category.name) >>>>>>> c7a726c5 (Rebased)
    24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix) ======= end >>>>>>> c7a726c5 (Rebased)
    25. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can edit an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'clicked read more', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can edit an category' do >>>>>>> 5b7749a (Fix) ======= it 'can edit an category' do >>>>>>> c7a726c5 (Rebased)
    26. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('Edit') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('Edit') >>>>>>> 5b7749a (Fix) ======= click_link('Edit') >>>>>>> c7a726c5 (Rebased)
    27. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) ======= click_link 'Read More' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= click_link 'Read More' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= fill_in 'category[name]', with: 'New Genre' >>>>>>> 5b7749a (Fix) ======= fill_in 'category[name]', with: 'New Genre' >>>>>>> c7a726c5 (Rebased)
    28. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_button('Update Category') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_button('Update Category') >>>>>>> 5b7749a (Fix) ======= click_button('Update Category') >>>>>>> c7a726c5 (Rebased)
    29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
    30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    31. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    32. 1 =======
    33. >>>>>>> d0dc1f1 (Featire specs) =======
    34. >>>>>>> 752f0c0 (Featire specs) =======
    35. >>>>>>> 4e81ea2 (Featire specs) =======
    36. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    38. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    40. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    41. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    42. 1 >>>>>>> 5b7749a (Fix) =======
    43. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content('New Genre') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('New Genre') >>>>>>> 5b7749a (Fix) ======= expect(page).to have_content('New Genre') >>>>>>> c7a726c5 (Rebased)
    44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) end
    45. end

    spec/feature/billing_spec.rb

    73.08% lines covered

    26 relevant lines. 19 lines covered and 7 lines missed.
        
    1. 1 RSpec.describe 'Billing', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
    6. 2 let(:user) { create(:user) }
    7. 1 let(:attributes_for) { attributes_for(:billing) }
    8. 1 describe '#fill_in', js: true do
    9. 1 it 'fill in billing' do
    10. 1 sign_in(user)
    11. 1 visit edit_user_path(user.id)
    12. 1 within('div#billing.col-md-5.mb-40') do
    13. 1 find_all('div', class: 'form-group')[0] do
    14. fill_in :first_name, with: attributes_for[:first_name]
    15. end
    16. 1 find_all('div', class: 'form-group')[1] do
    17. fill_in :last_name, with: attributes_for[:last_name]
    18. end
    19. 1 find_all('div', class: 'form-group')[2] do
    20. fill_in :address, with: attributes_for[:address]
    21. end
    22. 1 find_all('div', class: 'form-group')[3] do
    23. fill_in :city, with: attributes_for[:city]
    24. end
    25. 1 find_all('div', class: 'form-group')[4] do
    26. fill_in :zip, with: attributes_for[:zip]
    27. end
    28. 1 find_all('div', class: 'form-group')[5] do
    29. fill_in :country, with: attributes_for[:country]
    30. end
    31. 1 find_all('div', class: 'form-group')[6] do
    32. fill_in :phone, with: attributes_for[:phone]
    33. end
    34. 1 click_on I18n.t('settings.save')
    35. end
    36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
    37. end
    38. end
    39. end

    spec/feature/book_spec.rb

    100.0% lines covered

    104 relevant lines. 104 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Book', type: :feature do
    2. 5 let(:category_one) { create(:category) }
    3. 3 let(:category_two) { create(:category) }
    4. 1 let(:params) do
    5. 4 { title: FFaker::Book.title,
    6. description: FFaker::Book.description,
    7. price_cents: FFaker::Number.rand(1..100),
    8. dimensions: FFaker::Book.cover,
    9. year_of_publication: FFaker::Number.rand(1900..2022),
    10. materials: 'Soft cover',
    11. quantity: FFaker::Number.rand(2..5) }
    12. end
    13. 7 let(:book) { create(:book).decorate }
    14. 1 describe '#show book' do
    15. 1 it 'show books info' do
    16. 1 visit "books/#{book.id}"
    17. 1 expect(page).to have_content(book.title)
    18. end
    19. 1 it 'clicked Beck to results' do
    20. 1 visit "books/#{book.id}"
    21. 1 find('a', class: 'general-back-link').click
    22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
    23. end
    24. 1 context 'when test read more' do
    25. 1 it 'show read more' do
    26. 1 visit "books/#{book.id}"
    27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
    28. end
    29. 1 it 'clicked read more', js: true do
    30. 1 visit "books/#{book.id}"
    31. 1 <<<<<<< HEAD click_link I18n.t('book_page.read_more') ======= click_link 'Read More' >>>>>>> c7a726c5 (Rebased)
    32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
    33. end
    34. end
    35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    36. >>>>>>> d0dc1f1 (Featire specs) =======
    37. >>>>>>> 752f0c0 (Featire specs) =======
    38. >>>>>>> 4e81ea2 (Featire specs) =======
    39. >>>>>>> 08edf50 (Featire specs) =======
    40. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    41. >>>>>>> 7a02bbe (Featire specs) =======
    42. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    43. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    44. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) 1 context 'when quantity changes', js: true do
    45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    46. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    47. =======
    48. >>>>>>> d0dc1f1 (Featire specs) =======
    49. >>>>>>> 752f0c0 (Featire specs) =======
    50. >>>>>>> 4e81ea2 (Featire specs) =======
    51. >>>>>>> 08edf50 (Featire specs) =======
    52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    53. >>>>>>> 7a02bbe (Featire specs) =======
    54. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    55. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    56. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    57. >>>>>>> 5b7749a (Fix) =======
    58. >>>>>>> c7a726c5 (Rebased) 1 before do
    59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
    60. 2 visit "books/#{book.id}"
    61. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased)
    62. 2 find('a', class: 'inc').click
    63. end
    64. 1 <<<<<<< HEAD it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    65. 1 expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
    66. end
    67. 1 <<<<<<< HEAD it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    68. 1 find('a', class: 'dec').click
    69. 1 expect(page).to have_content("€#{book.price}")
    70. end
    71. end
    72. end
    73. 1 describe '#catalog' do
    74. 1 describe 'filter by category' do
    75. 1 before do
    76. 2 category_one.books.create(params)
    77. 2 visit books_path
    78. end
    79. 1 after do
    80. 2 category_one.destroy
    81. end
    82. 1 it 'show book count for category' do
    83. 1 expect(page).to have_content(category_one.books.size)
    84. end
    85. 1 it 'filter book by category' do
    86. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
    87. 1 click_on category_one.name
    88. end
    89. 1 expect(page).to have_content(category_one.books.first.title)
    90. end
    91. end
    92. 1 describe 'filter by all books' do
    93. 1 before do
    94. 2 category_one.books.create(params)
    95. 2 category_two.books.create(params)
    96. 2 visit books_path
    97. 2 click_on I18n.t('catalog_page.all')
    98. end
    99. 1 after do
    100. 2 category_one.destroy
    101. 2 category_two.destroy
    102. end
    103. 1 it 'shown books for first category' do
    104. 1 expect(page).to have_content(category_one.books.first.title)
    105. end
    106. 1 it 'shown books for second category' do
    107. 1 expect(page).to have_content(category_two.books.first.title)
    108. end
    109. end
    110. end
    111. 1 describe 'load_more' do
    112. 1 before do
    113. 3 <<<<<<< HEAD 24.times do ======= <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs)
    114. 72 books << create(:book)
    115. end
    116. end
    117. 4 let(:books) { [] }
    118. 1 it 'show books without view more button' do
    119. 1 visit books_path
    120. 1 find('a', id: 'view_more', class: 'view_more').click
    121. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
    122. end
    123. 1 context 'when view more' do
    124. 1 it 'show books with view more button' do
    125. 1 visit books_path
    126. 1 expect(page).to have_css('a', class: 'view_more')
    127. end
    128. 1 it 'show loaded books', js: true do
    129. 1 visit books_path
    130. 1 find('a', class: 'view_more').click
    131. 1 expect(page).to have_content(books.last.title)
    132. end
    133. end
    134. end
    135. 1 describe 'sort' do
    136. 1 shared_examples 'sort test' do
    137. 5 it 'sort books' do
    138. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
    139. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
    140. 5 create(:book, title: 'Anna', price_cents: 23,
    141. <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs)
    142. 5 visit books_path
    143. 5 find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
    144. id: 'menu').click
    145. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
    146. 5 click_link button
    147. end
    148. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
    149. end
    150. end
    151. 1 context 'when sort by title A to Z' do
    152. 2 let(:button) { I18n.t('catalog_page.sorting.title.asc') }
    153. 2 let(:book_title) { 'Anna' }
    154. 1 include_examples 'sort test'
    155. end
    156. 1 context 'when sort by title Z to A' do
    157. 2 let(:button) { I18n.t('catalog_page.sorting.title.desc') }
    158. 2 let(:book_title) { 'Zimbabwe' }
    159. 1 include_examples 'sort test'
    160. end
    161. 1 context 'when sort by price High to Low' do
    162. 2 let(:button) { I18n.t('catalog_page.sorting.price.desc') }
    163. 2 let(:book_title) { 'Zimbabwe' }
    164. 1 include_examples 'sort test'
    165. end
    166. 1 context 'when sort by price Low to High' do
    167. 2 let(:button) { I18n.t('catalog_page.sorting.price.asc') }
    168. 2 let(:book_title) { 'Anna' }
    169. 1 include_examples 'sort test'
    170. end
    171. 1 context 'when sort by newest' do
    172. 2 let(:button) { I18n.t('catalog_page.sorting.newer_first') }
    173. 2 let(:book_title) { 'Zimbabwe' }
    174. 1 include_examples 'sort test'
    175. end
    176. end
    177. end
    <<<<<<< HEAD =======

    spec/feature/cart_spec.rb

    96.55% lines covered

    29 relevant lines. 28 lines covered and 1 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe 'Cart', type: :feature, js: true do
    3. 5 let(:book) { FactoryBot.create(:book) }
    4. 1 before do
    5. 4 book
    6. 4 visit book_path(book.id)
    7. 4 click_button I18n.t('book_page.add_to_card')
    8. end
    9. 1 describe '#add_book_to_order' do
    10. 1 it 'add book to order' do
    11. 1 within('span', class: 'shop-icon') do
    12. 1 expect(page).to have_content(1)
    13. end
    14. end
    15. end
    16. 1 describe '#quantity_change' do
    17. 1 it 'book quantity inc' do
    18. 1 visit orders_path
    19. 1 within("a#inc#{book.id}.input-link") do
    20. 1 find('i.fa.fa-plus.line-heaght-40').click
    21. end
    22. 1 sleep(2)
    23. 1 expect(find_field("counter#{book.id}").value).to eq('2')
    24. end
    25. 1 it 'book quantity dec' do
    26. 1 visit orders_path
    27. 1 within("a#dec#{book.id}.input-link") do
    28. 1 find('i.fa.fa-minus.line-heaght-40').click
    29. end
    30. 1 sleep(2)
    31. 1 expect(find_field("counter#{book.id}").value).to eq('0')
    32. end
    33. end
    34. 1 describe '#remove_book_from_cart' do
    35. 1 it 'book quantity change' do
    36. 1 visit orders_path
    37. 1 find('button.close.general-cart-close').click
    38. expect(page).to have_content(I18n.t('order.messages.delete'))
    39. end
    40. end
    41. end

    spec/feature/coupon_spec.rb

    100.0% lines covered

    30 relevant lines. 30 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 require_relative '../support/shared_context'
    3. 1 RSpec.describe 'Coupon', type: :feature, js: true do
    4. 1 include_context 'with api request authentication helper methods'
    5. 1 include_context 'with api request global before and after hooks'
    6. 5 let(:user) { FactoryBot.create(:user) }
    7. 4 let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
    8. 5 let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
    9. 5 let(:book) { FactoryBot.create(:book, price_cents: 1234) }
    10. 5 let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
    11. 1 before do
    12. 4 sign_in(user)
    13. 4 order
    14. 4 order_book
    15. 4 visit orders_path
    16. end
    17. 1 describe '#valid coupon' do
    18. 1 before do
    19. 3 fill_in 'input', with: coupon.code
    20. 3 click_button I18n.t('order.apply')
    21. end
    22. 1 it 'sub price' do
    23. 1 expect(page).to have_content("SubTotal:\n€ 12.34")
    24. end
    25. 1 it 'use coupon' do
    26. 1 expect(page).to have_content("Coupon:\n€ 1.85")
    27. end
    28. 1 it 'count price with coupon' do
    29. 1 expect(page).to have_content('Order Total: € 10.49')
    30. end
    31. end
    32. 1 describe '#invalid coupon' do
    33. 1 it 'show error message' do
    34. 1 fill_in 'input', with: 'dasdasdqe1243wasad'
    35. 1 click_button I18n.t('order.apply')
    36. 1 expect(page).to have_content(I18n.t('order.coupon.error'))
    37. end
    38. end
    39. end
    >>>>>>> 366b257 (Fix)

    spec/feature/home_spec.rb

    100.0% lines covered

    49 relevant lines. 49 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Home', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 1 describe 'Get Started' do
    5. 1 it 'on click move to catalog page' do
    6. 1 visit root_path
    7. 1 click_on 'Get Started'
    8. 1 expect(page).to have_content('Catalog')
    9. end
    10. end
    11. 1 describe 'navbar' do
    12. 2 let(:books_category) { create(:books_category) }
    13. 1 it 'on click home move to root-path' do
    14. 1 visit books_path
    15. 1 find('a', id: 'root').click
    16. 1 expect(page).to have_content('Get Started')
    17. end
    18. 1 it 'on click category name move to root-path with books that belong to this category' do
    19. 1 books_category
    20. 1 visit root_path
    21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
    22. 1 within('ul', id: 'nav') do
    23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
    24. end
    25. 1 expect(page).to have_content(books_category.category.books.first.title)
    26. end
    27. 1 context 'when guest' do
    28. 1 it 'on click login go to login page' do
    29. 1 visit root_path
    30. 1 within 'div', class: 'visible-xs' do
    31. 1 click_link I18n.t('header.log_in')
    32. end
    33. 1 expect(page).to have_content(I18n.t('header.log_in'))
    34. end
    35. 1 it 'on click sing up go to sing up page' do
    36. 1 visit root_path
    37. 1 within 'div', class: 'visible-xs' do
    38. 1 click_link I18n.t('header.sing_up')
    39. end
    40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
    41. end
    42. end
    43. 1 context 'when user', js: true do
    44. 4 let(:user) { create(:user) }
    45. 1 before do
    46. 3 sign_in(user)
    47. end
    48. 1 it 'on click account show settings' do
    49. 1 visit root_path
    50. 1 click_on I18n.t('header.account')
    51. 1 expect(page).to have_content(I18n.t('header.settings'))
    52. end
    53. 1 it 'on click account show log_out' do
    54. 1 visit root_path
    55. 1 click_on I18n.t('header.account')
    56. 1 expect(page).to have_content(I18n.t('header.log_out'))
    57. end
    58. 1 it 'log_out' do
    59. 1 visit root_path
    60. 1 click_on I18n.t('header.account')
    61. 1 click_on(I18n.t('header.log_out'), match: :first)
    62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
    63. end
    64. end
    65. end
    66. end

    spec/feature/login_spec.rb

    <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> c7a726c5 (Rebased) 100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= ======= >>>>>>> c7a726c5 (Rebased) 19 relevant lines. 19 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Login', type: :feature do
    2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
    3. 1 describe '#login' do
    4. 1 before do
    5. 2 visit new_user_session_path
    6. end
    7. 1 context 'when successfully login' do
    8. 1 it 'login' do
    9. 1 within 'form', class: 'new_user', id: 'new_user' do
    10. 1 fill_in 'user_email', with: user_second.email
    11. 1 fill_in 'user_password', with: user_second.password
    12. 1 click_on I18n.t('header.log_in')
    13. end
    14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
    15. end
    16. end
    17. 1 context 'when unsuccessfully login' do
    18. 1 it 'didn`t login' do
    19. 1 within 'form', class: 'new_user', id: 'new_user' do
    20. 1 fill_in 'user_email', with: user_second.email
    21. 1 fill_in 'user_password', with: 'wrong_password'
    22. 1 click_on I18n.t('header.log_in')
    23. end
    24. 1 expect(page).to have_text 'Invalid Email or password.'
    25. end
    26. end
    27. end
    28. end

    spec/feature/new_password_spec.rb

    100.0% lines covered

    13 relevant lines. 13 lines covered and 0 lines missed.
        
    1. 1 require_relative '../rails_helper'
    2. 1 require_relative '../support/shared_context'
    3. 1 RSpec.describe 'New Password', type: :feature do
    4. 3 let(:user) { FactoryBot.create(:user) }
    5. 1 describe '#new_password' do
    6. 1 it 'change password' do
    7. 1 user.reset_password('newPassword', 'newPassword')
    8. 1 expect(user.password).to eq('newPassword')
    9. end
    10. 1 it 'not validate password' do
    11. 1 visit new_user_password_path
    12. 1 fill_in 'email', with: user.email
    13. 1 click_on I18n.t('login.send_instructions')
    14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
    15. end
    16. end
    17. end

    spec/feature/registration_spec.rb

    100.0% lines covered

    29 relevant lines. 29 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Registration', type: :feature do
    2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
    3. 1 describe '#sing_up' do
    4. 1 before do
    5. 3 visit new_user_registration_path
    6. end
    7. 1 context 'when successfully sing_up' do
    8. 1 it 'sing_up users' do
    9. 1 within 'form', class: 'new_user', id: 'new_user' do
    10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
    11. 1 fill_in 'user_password', with: user.password
    12. 1 fill_in 'user_password_confirmation', with: user.password
    13. 1 click_on I18n.t('header.sing_up')
    14. end
    15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
    16. end
    17. end
    18. 1 context 'when users is already exits' do
    19. 1 it 'sing_up users' do
    20. 1 within 'form', class: 'new_user', id: 'new_user' do
    21. 1 fill_in 'user_email', with: user.email
    22. 1 fill_in 'user_password', with: user.password
    23. 1 fill_in 'user_password_confirmation', with: user.password
    24. 1 click_on I18n.t('header.sing_up')
    25. end
    26. 1 expect(page).to have_text('Email has already been taken')
    27. end
    28. end
    29. 1 context 'when unsuccessfully sing_up' do
    30. 1 it 'didn`t sing_up' do
    31. 1 within 'form', class: 'new_user', id: 'new_user' do
    32. 1 fill_in 'user_email', with: FFaker::Internet.email
    33. 1 fill_in 'user_password', with: 'password'
    34. 1 fill_in 'user_password_confirmation', with: 'wrong'
    35. 1 click_on I18n.t('header.sing_up')
    36. end
    37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
    38. end
    39. end
    40. end
    41. end

    spec/feature/review_spec.rb

    100.0% lines covered

    <<<<<<< HEAD 28 relevant lines. 28 lines covered and ======= 30 relevant lines. 30 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
        
    1. 1 <<<<<<< HEAD RSpec.describe 'Review', type: :feature do ======= require_relative '../rails_helper' >>>>>>> c7a726c5 (Rebased)
    2. 1 <<<<<<< HEAD include_context 'with api request authentication helper methods' ======= require_relative '../support/shared_context' >>>>>>> c7a726c5 (Rebased)
    3. <<<<<<< HEAD
    4. 1 include_context 'with api request global before and after hooks'
    5. =======
    6. >>>>>>> c7a726c5 (Rebased)
    7. <<<<<<< HEAD
    8. 3 =======
    9. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD let(:user) { create(:user).decorate } ======= RSpec.describe 'Review', type: :feature do >>>>>>> c7a726c5 (Rebased)
    10. <<<<<<< HEAD
    11. 3 =======
    12. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD let(:book) { create(:book).decorate } ======= include_context 'with api request authentication helper methods'
    13. 1 include_context 'with api request global before and after hooks' >>>>>>> c7a726c5 (Rebased)
    14. <<<<<<< HEAD
    15. 1 =======
    16. 3 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD before do ======= let(:user) { FactoryBot.create(:user).decorate } >>>>>>> c7a726c5 (Rebased)
    17. <<<<<<< HEAD
    18. 2 =======
    19. 3 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD sign_in(user) ======= let(:book) { FactoryBot.create(:book).decorate } >>>>>>> c7a726c5 (Rebased)
    20. <<<<<<< HEAD
    21. =======
    22. 1 before do
    23. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD visit book_path(book)
    24. end ======= sign_in(user) >>>>>>> c7a726c5 (Rebased)
    25. <<<<<<< HEAD
    26. 1 shared_examples 'review' do
    27. =======
    28. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD it 'review' do ======= visit book_path(book) >>>>>>> c7a726c5 (Rebased)
    29. <<<<<<< HEAD
    30. 2 =======
    31. >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD find('i', id: rating).click ======= end >>>>>>> c7a726c5 (Rebased)
    32. <<<<<<< HEAD
    33. =======
    34. >>>>>>> c7a726c5 (Rebased)
    35. <<<<<<< HEAD =======
    36. 1 shared_examples 'review' do
    37. >>>>>>> c7a726c5 (Rebased)
    38. 2 <<<<<<< HEAD fill_in :title, with: FFaker::Lorem.sentence(title_words) ======= it 'review' do >>>>>>> c7a726c5 (Rebased)
    39. 2 <<<<<<< HEAD fill_in :body, with: FFaker::Lorem.sentence(body_words) ======= find('i', id: rating).click >>>>>>> c7a726c5 (Rebased)
    40. 2 <<<<<<< HEAD click_on I18n.t('review.post') ======= fill_in :title, with: FFaker::Lorem.sentence(title_words) >>>>>>> c7a726c5 (Rebased)
    41. <<<<<<< HEAD
    42. =======
    43. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
    44. >>>>>>> c7a726c5 (Rebased)
    45. <<<<<<< HEAD
    46. =======
    47. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD expect(page).to have_content(result)
    48. end ======= click_on I18n.t('review.post') >>>>>>> c7a726c5 (Rebased)
    49. <<<<<<< HEAD =======
    50. 2 expect(page).to have_content(result)
    51. end
    52. >>>>>>> c7a726c5 (Rebased) end
    53. <<<<<<< HEAD
    54. =======
    55. >>>>>>> c7a726c5 (Rebased)
    56. <<<<<<< HEAD
    57. =======
    58. >>>>>>> c7a726c5 (Rebased) 1 describe '#post review', js: true do
    59. <<<<<<< HEAD
    60. =======
    61. >>>>>>> c7a726c5 (Rebased) 1 context 'when review posted' do
    62. <<<<<<< HEAD
    63. =======
    64. >>>>>>> c7a726c5 (Rebased) 2 let(:rating) { "star#{rand(1..5)}" }
    65. <<<<<<< HEAD
    66. =======
    67. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD let(:title_words) { 3 } ======= let(:title_words) { 5 } >>>>>>> c7a726c5 (Rebased)
    68. <<<<<<< HEAD
    69. =======
    70. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD let(:body_words) { 5 } ======= let(:body_words) { 10 } >>>>>>> c7a726c5 (Rebased)
    71. <<<<<<< HEAD
    72. =======
    73. >>>>>>> c7a726c5 (Rebased) 2 let(:result) { user.name_or_email }
    74. <<<<<<< HEAD
    75. 1 include_examples 'review'
    76. end
    77. ======= >>>>>>> c7a726c5 (Rebased)
    78. 1 <<<<<<< HEAD context 'when review not been posted' do
    79. 2 let(:rating) { "star#{rand(1..5)}" }
    80. 2 let(:title_words) { 80 }
    81. 2 let(:body_words) { 30 }
    82. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
    83. 1 ======= >>>>>>> c7a726c5 (Rebased) include_examples 'review'
    84. <<<<<<< HEAD
    85. =======
    86. >>>>>>> c7a726c5 (Rebased) end
    87. <<<<<<< HEAD =======
    88. 1 context 'when review not been posted' do
    89. 2 let(:rating) { "star#{rand(1..5)}" }
    90. 2 let(:title_words) { 80 }
    91. 2 let(:body_words) { 30 }
    92. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
    93. >>>>>>> c7a726c5 (Rebased)
    94. <<<<<<< HEAD =======
    95. 1 include_examples 'review'
    96. end
    97. >>>>>>> c7a726c5 (Rebased) end
    98. <<<<<<< HEAD
    99. =======
    100. >>>>>>> c7a726c5 (Rebased) end

    spec/feature/settings_spec.rb

    100.0% lines covered

    34 relevant lines. 34 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Settings', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 4 let(:user) { create(:user) }
    5. 1 before do
    6. 3 sign_in(user)
    7. 3 visit edit_user_path(user.id)
    8. 3 click_link I18n.t('settings.privacy')
    9. end
    10. 1 describe '#email_change' do
    11. 1 it 'change email' do
    12. 1 within('div', id: 'email') do
    13. 1 fill_in :email, with: FFaker::Internet.email
    14. 1 click_on I18n.t('settings.save')
    15. end
    16. 1 user.confirm
    17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
    18. end
    19. end
    20. 1 describe '#password_change' do
    21. 1 context 'when error' do
    22. 1 it 'didnt change password' do
    23. 1 within('div', id: 'password') do
    24. 1 fill_in :current_password, with: user.password
    25. 1 fill_in :password, with: 'newPassword'
    26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
    27. 1 click_on I18n.t('settings.save')
    28. end
    29. 1 user.confirm
    30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
    31. end
    32. end
    33. 1 context 'when successful' do
    34. 1 it 'didnt change password' do
    35. 1 within('div', id: 'password') do
    36. 1 fill_in :current_password, with: user.password
    37. 1 fill_in :password, with: 'newPassword'
    38. 1 fill_in :password_confirmation, with: 'newPassword'
    39. 1 click_on I18n.t('settings.save')
    40. end
    41. 1 user.confirm
    42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
    43. end
    44. end
    45. end
    46. end

    spec/feature/shipping_spec.rb

    73.08% lines covered

    26 relevant lines. 19 lines covered and 7 lines missed.
        
    1. 1 RSpec.describe 'Shipping', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 2 let(:user) { FactoryBot.create(:user) }
    5. 1 let(:attributes_for) { attributes_for(:shipping) }
    6. 1 describe '#fill_in', js: true do
    7. 1 it 'fill in shipping' do
    8. 1 sign_in(user)
    9. 1 visit edit_user_path(user.id)
    10. 1 within('div#shipping.col-md-5.mb-40') do
    11. 1 find_all('div', class: 'form-group')[0] do
    12. fill_in :first_name, with: attributes_for[:first_name]
    13. end
    14. 1 find_all('div', class: 'form-group')[1] do
    15. fill_in :last_name, with: attributes_for[:last_name]
    16. end
    17. 1 find_all('div', class: 'form-group')[2] do
    18. fill_in :address, with: attributes_for[:address]
    19. end
    20. 1 find_all('div', class: 'form-group')[3] do
    21. fill_in :city, with: attributes_for[:city]
    22. end
    23. 1 find_all('div', class: 'form-group')[4] do
    24. fill_in :zip, with: attributes_for[:zip]
    25. end
    26. 1 find_all('div', class: 'form-group')[5] do
    27. fill_in :country, with: attributes_for[:country]
    28. end
    29. 1 find_all('div', class: 'form-group')[6] do
    30. fill_in :phone, with: attributes_for[:phone]
    31. end
    32. 1 click_on I18n.t('settings.save')
    33. end
    34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
    35. end
    36. end
    37. end

    spec/feature/user_spec.rb

    100.0% lines covered

    42 relevant lines. 42 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'User', type: :feature do
    2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
    3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
    4. 1 describe '#sing_up' do
    5. 1 context 'when successfully sing_up' do
    6. 1 before do
    7. 1 visit new_user_registration_path
    8. 1 within 'form', class: 'new_user', id: 'new_user' do
    9. 1 fill_in 'user_email', with: user.email
    10. 1 fill_in 'user_password', with: user.password
    11. 1 fill_in 'user_password_confirmation', with: user.password
    12. 1 click_on I18n.t('header.sing_up')
    13. end
    14. end
    15. 1 it 'sing_up user' do
    16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
    17. end
    18. end
    19. 1 context 'when unsuccessfully sing_up' do
    20. 1 it 'didn`t sing_up' do
    21. 1 visit new_user_registration_path
    22. 1 within 'form', class: 'new_user', id: 'new_user' do
    23. 1 fill_in 'user_email', with: FFaker::Internet.email
    24. 1 fill_in 'user_password', with: 'wrong'
    25. 1 fill_in 'user_password_confirmation', with: 'wrong'
    26. 1 click_on I18n.t('header.sing_up')
    27. end
    28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
    29. end
    30. end
    31. end
    32. 1 describe '#login' do
    33. 1 before do
    34. 2 user_second.confirm
    35. end
    36. 1 context 'when successfully login' do
    37. 1 it 'login' do
    38. 1 visit new_user_session_path
    39. 1 within 'form', class: 'new_user', id: 'new_user' do
    40. 1 fill_in 'user_email', with: user_second.email
    41. 1 fill_in 'user_password', with: user_second.password
    42. 1 click_on I18n.t('header.log_in')
    43. end
    44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
    45. end
    46. end
    47. 1 context 'when unsuccessfully login' do
    48. 1 it 'didn`t login' do
    49. 1 visit new_user_session_path
    50. 1 within 'form', class: 'new_user', id: 'new_user' do
    51. 1 fill_in 'user_email', with: user_second.email
    52. 1 fill_in 'user_password', with: 'wrong_password'
    53. 1 click_on I18n.t('header.log_in')
    54. end
    55. 1 expect(page).to have_text 'Invalid Email or password.'
    56. end
    57. end
    58. end
    59. end

    spec/models/admin_user_spec.rb

    100.0% lines covered

    5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AdminUser, type: :model do
    3. 1 context 'when validations' do
    4. 2 <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:email) }
    5. 2 it { is_expected.to validate_presence_of(:password) }
    6. end
    7. end

    spec/models/author_spec.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD it { is_expected.to validate_presence_of(:email) } ======= RSpec.describe Author, type: :model do >>>>>>> c7a726c5 (Rebased)
    2. <<<<<<< HEAD
    3. 2 =======
    4. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD it { is_expected.to validate_presence_of(:password) } ======= describe 'author' do
    5. 1 context 'when validations' do
    6. 2 it { is_expected.to validate_presence_of(:first_name) }
    7. 2 it { is_expected.to validate_presence_of(:last_name) }
    8. end >>>>>>> c7a726c5 (Rebased)
    9. end
    10. end

    spec/models/author_spec.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Author, type: :model do
    2. 1 describe 'author' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:first_name) }
    5. 2 it { is_expected.to validate_presence_of(:last_name) }
    6. end
    7. 1 context 'when associations' do
    8. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
    9. 2 it { is_expected.to have_many(:books).through(:authors_books) }
    10. end
    11. end
    12. end

    spec/models/authors_book_spec.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe AuthorsBook, type: :model do
    2. 1 describe 'authors_book' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:book) }
    5. 2 it { is_expected.to validate_presence_of(:author) }
    6. end
    7. 1 context 'when associations' do
    8. 2 it { is_expected.to belong_to(:author) }
    9. 2 it { is_expected.to belong_to(:book) }
    10. end
    11. end
    12. end

    spec/models/billing_spec.rb

    100.0% lines covered

    20 relevant lines. 20 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Billing, type: :model do
    2. 1 describe 'billing' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
    5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
    6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
    7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
    8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
    9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
    10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
    11. end
    12. 1 context 'when not validations' do
    13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
    14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
    15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
    16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
    17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
    18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
    19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
    20. end
    21. 1 context 'when associations' do
    22. 2 it { is_expected.to belong_to(:user) }
    23. end
    24. end
    25. end

    spec/models/book_spec.rb

    100.0% lines covered

    16 relevant lines. 16 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Book, type: :model do
    2. 1 describe 'books' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:title) }
    5. 2 it { is_expected.to validate_presence_of(:description) }
    6. 2 it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
    7. 2 it { is_expected.to validate_presence_of(:year_of_publication) }
    8. 2 it { is_expected.to validate_presence_of(:quantity) }
    9. 2 it { is_expected.to validate_presence_of(:materials) }
    10. 2 it { is_expected.to validate_presence_of(:dimensions) }
    11. end
    12. 1 context 'when associations' do
    13. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
    14. 2 it { is_expected.to have_many(:authors).through(:authors_books) }
    15. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
    16. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
    17. 2 it { is_expected.to have_many(:reviews).dependent(:destroy) }
    18. end
    19. end
    20. end

    spec/models/books_category_spec.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe BooksCategory, type: :model do
    2. 1 describe 'books_categories' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:book) }
    5. 2 it { is_expected.to validate_presence_of(:category) }
    6. end
    7. 1 context 'when associations' do
    8. 2 it { is_expected.to belong_to(:category) }
    9. 2 it { is_expected.to belong_to(:book) }
    10. end
    11. end
    12. end

    spec/models/category_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Category, type: :model do
    2. 1 describe 'category' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:name) }
    5. end
    6. 1 context 'when associations' do
    7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
    8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
    9. end
    10. end
    11. end

    spec/models/review_spec.rb

    100.0% lines covered

    14 relevant lines. 14 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe Review, type: :model do
    3. 1 describe 'review' do
    4. 1 context 'when validations' do
    5. 2 it { is_expected.to validate_presence_of(:title) }
    6. 2 it { is_expected.to validate_presence_of(:body) }
    7. 2 it { is_expected.to validate_presence_of(:rating) }
    8. 2 it { is_expected.to validate_presence_of(:verified) }
    9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
    10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
    11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
    12. end
    13. 1 context 'when associations' do
    14. 2 it { is_expected.to belong_to(:book) }
    15. 2 it { is_expected.to belong_to(:user) }
    16. end
    17. end
    18. end

    spec/models/shipping_spec.rb

    100.0% lines covered

    20 relevant lines. 20 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Shipping, type: :model do
    2. 1 describe 'shipping' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
    5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
    6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
    7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
    8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
    9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
    10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
    11. end
    12. 1 context 'when not validations' do
    13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
    14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
    15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
    16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
    17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
    18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
    19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
    20. end
    21. 1 context 'when associations' do
    22. 2 it { is_expected.to belong_to(:user) }
    23. end
    24. end
    25. end

    spec/models/user_spec.rb

    100.0% lines covered

    9 relevant lines. 9 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe User, type: :model do
    2. 1 let(:user) { FactoryBot.create(:user) }
    3. 1 describe 'author' do
    4. 1 context 'when validations' do
    5. 2 it { is_expected.to validate_presence_of(:email) }
    6. 2 it { is_expected.to validate_presence_of(:password) }
    7. end
    8. 1 context 'with associations' do
    9. 2 it { is_expected.to have_one(:billing) }
    10. 2 it { is_expected.to have_one(:shipping) }
    11. end
    12. end
    13. end

    spec/queryes/book_query_spec.rb

    100.0% lines covered

    45 relevant lines. 45 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe BookQuery do
    3. 1 shared_examples 'sort test' do
    4. 5 it 'sort' do
    5. 5 books
    6. 5 expect(test).to eq(result)
    7. end
    8. end
    9. 3 let(:titles) { %w[Adam Zimbabwe] }
    10. 1 let(:books_dates) do
    11. 1 ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
    12. end
    13. 1 describe 'all books sort' do
    14. 1 context 'when sort by title A to Z' do
    15. 1 let(:books) do
    16. 1 create(:book, title: titles.first)
    17. 1 create(:book, title: titles.second)
    18. end
    19. 2 let(:result) { titles.second }
    20. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
    21. 1 include_examples 'sort test'
    22. end
    23. 1 context 'when sort title Z to A' do
    24. 1 let(:books) do
    25. 1 create(:book, title: titles.first)
    26. 1 create(:book, title: titles.second)
    27. end
    28. 2 let(:result) { titles.first }
    29. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
    30. 1 include_examples 'sort test'
    31. end
    32. 1 context 'when sort by price High to Low' do
    33. 1 let(:books) do
    34. 1 create(:book, price_cents: 75)
    35. 1 create(:book, price_cents: 23)
    36. end
    37. 2 let(:result) { 75 }
    38. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
    39. 1 include_examples 'sort test'
    40. end
    41. 1 context 'when sort price Low to High' do
    42. 1 let(:books) do
    43. 1 create(:book, price_cents: 75)
    44. 1 create(:book, price_cents: 23)
    45. end
    46. 2 let(:result) { 23 }
    47. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
    48. 1 include_examples 'sort test'
    49. end
    50. 1 context 'when sort by Newest' do
    51. 1 let(:books) do
    52. 1 create(:book, created_at: books_dates.first)
    53. 1 create(:book, created_at: books_dates.second)
    54. end
    55. 2 let(:result) { books_dates.first }
    56. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
    57. 1 include_examples 'sort test'
    58. end
    59. end
    60. end

    spec/support/configs/capybara.rb

    100.0% lines covered

    19 relevant lines. 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed.
        
    1. 1 RSpec.describe 'Author' do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD
    5. 2 let(:first_name) { FFaker::Name.first_name }
    6. 2 let(:last_name) { FFaker::Name.last_name }
    7. 2 let(:new_name) { FFaker::Name.first_name }
    8. 2 let(:old_name) { author.first_name }
    9. 4 let(:author) { create(:author) }
    10. 1 before do
    11. 4 sign_in(create(:admin_user), :admin_user)
    12. end
    13. 1 it 'can create an author' do
    14. 1 visit 'admin/authors'
    15. 1 click_link('New Author')
    16. 1 fill_in 'author[first_name]', with: first_name
    17. 1 fill_in 'author[last_name]', with: last_name
    18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
    19. end
    20. 1 it 'can delete an author' do
    21. 1 author
    22. 1 visit 'admin/authors'
    23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
    24. end
    25. 1 it 'can view an author' do
    26. 1 author
    27. 1 visit 'admin/authors'
    28. 1 click_link('View')
    29. 1 expect(page).to have_content(author.first_name)
    30. end
    31. 1 it 'can edit an author' do
    32. 1 author
    33. 1 visit 'admin/authors'
    34. 1 click_link('Edit')
    35. 1 fill_in 'author[first_name]', with: new_name
    36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
    37. end
    38. end

    spec/feature/admin/book_spec.rb

    100.0% lines covered

    43 relevant lines. 43 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Book' do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. <<<<<<< HEAD <<<<<<< HEAD
    5. 7 =======
    6. =======
    7. >>>>>>> d0dc1f1 (Featire specs) =======
    8. >>>>>>> 752f0c0 (Featire specs) 5 >>>>>>> 93bdda9 (Featire specs) =======
    9. 7 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:book) { create(:book) } ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) let(:category_one) { FactoryBot.create(:category) }
    10. 3 let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { create(:book) } >>>>>>> 872e675 (Fix) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    11. 1 let(:params) do
    12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    13. 1 =======
    14. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
    15. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    16. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
    17. 4 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) { title: FFaker::Book.title,
    18. description: FFaker::Book.description,
    19. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    20. dimensions: FFaker::Book.cover,
    21. year_of_publication: FFaker::Number.rand(1900..2022),
    22. materials: 'Soft cover',
    23. quantity: FFaker::Number.rand(2..5) }
    24. end
    25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    26. 1 before do
    27. 6 sign_in(create(:admin_user), :admin_user)
    28. 6 book
    29. 6 visit 'admin/books'
    30. end
    31. 1 it 'can create an category' do
    32. 1 click_link('New Book')
    33. 1 fill_in 'book[title]', with: params[:title]
    34. 1 fill_in 'book[description]', with: params[:description]
    35. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
    36. 1 fill_in 'book[price_cents]', with: params[:price_cents]
    37. 1 fill_in 'book[materials]', with: params[:materials]
    38. 1 fill_in 'book[dimensions]', with: params[:dimensions]
    39. 1 fill_in 'book[quantity]', with: params[:quantity]
    40. 1 click_button('Create Book')
    41. 1 expect(page).to have_content(params[:title])
    42. end
    43. 1 it 'can delete an book' do
    44. 1 click_link('Delete')
    45. 1 expect(page).not_to have_content(book.title)
    46. end
    47. 1 it 'can view an book' do
    48. 1 click_link('View')
    49. 1 expect(page).to have_content(book.title)
    50. end
    51. 1 it 'can edit an book' do
    52. 1 click_link('Edit')
    53. 1 fill_in 'book[title]', with: 'New title'
    54. 1 click_button('Update Book')
    55. 1 expect(page).to have_content('New title')
    56. end
    57. 1 context 'when image' do
    58. 1 before do
    59. 2 click_link('Edit')
    60. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
    61. 2 click_on 'Update Book'
    62. end
    63. 1 it 'can add images to book' do
    64. 1 expect(book.reload.images.count).to eq(1)
    65. end
    66. 1 it 'can delete images from book' do
    67. 1 click_link('Edit')
    68. 1 click_link('Delete')
    69. 1 expect(book.reload.images.count).to eq(0)
    70. end
    71. end
    72. end

    spec/feature/admin/category_spec.rb

    100.0% lines covered

    25 relevant lines. 25 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Category' do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 2 let(:category_name) { FFaker::Book.genre }
    5. 5 let(:category) { create(:category) }
    6. 1 before do
    7. 4 sign_in(create(:admin_user), :admin_user)
    8. 4 category
    9. 4 visit 'admin/categories'
    10. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) =======
    11. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
    12. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
    13. 7 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    14. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can create an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    15. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('New Category') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    17. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    18. ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    19. 1 visit "books/#{book.id}"
    20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
    21. >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    23. =======
    24. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    25. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
    26. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    27. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    28. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD fill_in 'category[name]', with: category_name >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    30. =======
    31. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    32. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
    33. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    34. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    35. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    36. 1 click_button('Create Category') <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= end >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    37. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content(category_name) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    39. =======
    40. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
    41. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    42. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
    43. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    44. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can delete an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    46. 1 click_link('Delete')
    47. <<<<<<< HEAD <<<<<<< HEAD =======
    48. >>>>>>> d0dc1f1 (Featire specs) =======
    49. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
    50. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
    51. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    53. =======
    54. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    55. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
    56. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    57. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    58. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content(category.name) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) expect(page).to have_content('Catalog')
    59. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).not_to have_content(category.name) >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    62. =======
    63. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
    64. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    65. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
    66. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    67. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can view an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    68. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('View') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    69. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content(category.name) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    71. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can edit an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    72. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('Edit') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    73. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    74. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_button('Update Category') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    76. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    77. 1 =======
    78. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
    79. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    80. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
    81. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content('New Genre') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end
    83. end

    spec/feature/billing_spec.rb

    73.08% lines covered

    26 relevant lines. 19 lines covered and 7 lines missed.
        
    1. 1 RSpec.describe 'Billing', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    6. 2 let(:user) { create(:user) }
    7. 1 let(:attributes_for) { attributes_for(:billing) }
    8. 1 describe '#fill_in', js: true do
    9. 1 it 'fill in billing' do
    10. 1 sign_in(user)
    11. 1 visit edit_user_path(user.id)
    12. 1 within('div#billing.col-md-5.mb-40') do
    13. 1 find_all('div', class: 'form-group')[0] do
    14. fill_in :first_name, with: attributes_for[:first_name]
    15. end
    16. 1 find_all('div', class: 'form-group')[1] do
    17. fill_in :last_name, with: attributes_for[:last_name]
    18. end
    19. 1 find_all('div', class: 'form-group')[2] do
    20. fill_in :address, with: attributes_for[:address]
    21. end
    22. 1 find_all('div', class: 'form-group')[3] do
    23. fill_in :city, with: attributes_for[:city]
    24. end
    25. 1 find_all('div', class: 'form-group')[4] do
    26. fill_in :zip, with: attributes_for[:zip]
    27. end
    28. 1 find_all('div', class: 'form-group')[5] do
    29. fill_in :country, with: attributes_for[:country]
    30. end
    31. 1 find_all('div', class: 'form-group')[6] do
    32. fill_in :phone, with: attributes_for[:phone]
    33. end
    34. 1 click_on I18n.t('settings.save')
    35. end
    36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
    37. end
    38. end
    39. end

    spec/feature/book_spec.rb

    100.0% lines covered

    104 relevant lines. 104 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Book', type: :feature do
    2. 5 let(:category_one) { create(:category) }
    3. 3 let(:category_two) { create(:category) }
    4. 1 let(:params) do
    5. 4 { title: FFaker::Book.title,
    6. description: FFaker::Book.description,
    7. price_cents: FFaker::Number.rand(1..100),
    8. dimensions: FFaker::Book.cover,
    9. year_of_publication: FFaker::Number.rand(1900..2022),
    10. materials: 'Soft cover',
    11. quantity: FFaker::Number.rand(2..5) }
    12. end
    13. 7 let(:book) { create(:book).decorate }
    14. 1 describe '#show book' do
    15. 1 it 'show books info' do
    16. 1 visit "books/#{book.id}"
    17. 1 expect(page).to have_content(book.title)
    18. end
    19. 1 it 'clicked Beck to results' do
    20. 1 visit "books/#{book.id}"
    21. 1 find('a', class: 'general-back-link').click
    22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
    23. end
    24. 1 context 'when test read more' do
    25. 1 it 'show read more' do
    26. 1 visit "books/#{book.id}"
    27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
    28. end
    29. 1 it 'clicked read more', js: true do
    30. 1 visit "books/#{book.id}"
    31. 1 click_link I18n.t('book_page.read_more')
    32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
    33. end
    34. end
    35. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
    36. >>>>>>> d0dc1f1 (Featire specs) =======
    37. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
    38. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
    39. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= =======
    40. >>>>>>> 4e81ea2 (Featire specs) =======
    41. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    42. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 context 'when quantity changes', js: true do
    43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    44. =======
    45. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    46. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    47. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    48. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    49. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    50. >>>>>>> 4e81ea2 (Featire specs) =======
    51. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    53. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 before do
    54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    55. 2 visit "books/#{book.id}"
    56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    57. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'inc').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'inc').click >>>>>>> 5b7749a (Fix)
    58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
    59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    61. 1 =======
    62. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    63. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    64. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    65. 2 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    66. 2 >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD
    67. 2 >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
    68. 2 >>>>>>> e3e66f3 (Featire specs) =======
    69. 1 >>>>>>> 5b7749a (Fix) it 'increase quantity' do
    70. <<<<<<< HEAD
    71. end
    72. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= =======
    73. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= it 'increase quantity' do >>>>>>> 872e675 (Fix) ======= it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    75. =======
    76. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= =======
    77. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    78. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    79. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    80. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    81. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
    82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    83. >>>>>>> d0dc1f1 (Featire specs) =======
    84. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
    85. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
    86. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    87. >>>>>>> 4e81ea2 (Featire specs) =======
    88. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) end
    89. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    90. =======
    91. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    92. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    93. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    94. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    95. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    96. >>>>>>> 4e81ea2 (Featire specs) =======
    97. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    98. >>>>>>> 5b7749a (Fix)
    99. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    100. =======
    101. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    102. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    103. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    104. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    105. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    106. >>>>>>> 4e81ea2 (Featire specs) =======
    107. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    108. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= it 'decrease quantity' do >>>>>>> 872e675 (Fix) ======= it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'decrease quantity' do >>>>>>> 5b7749a (Fix)
    109. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    110. =======
    111. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    112. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    113. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    114. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    115. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    116. >>>>>>> 4e81ea2 (Featire specs) =======
    117. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    118. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'dec').click ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price * 2}")
    119. end
    120. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'dec').click >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dec').click >>>>>>> 5b7749a (Fix)
    121. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) it 'decrease quantity', js: true do ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'decrease quantity', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    122. 1 find('a', class: 'dec').click
    123. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) expect(page).to have_content("€#{book.price}")
    124. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    125. end
    126. end
    127. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    128. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
    129. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
    130. end
    131. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    132. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    133. 1 describe '#catalog' do
    134. 1 describe 'filter by category' do
    135. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    136. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe '#catalog' do
    137. 1 describe 'filter by category' do
    138. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) before do
    139. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    140. =======
    141. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    142. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    143. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    144. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    145. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    146. >>>>>>> 4e81ea2 (Featire specs) =======
    147. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    148. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    149. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    150. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    151. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    152. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    153. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    154. >>>>>>> 5b7749a (Fix) 2 category_one.books.create(params)
    155. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    156. =======
    157. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    158. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    159. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    160. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    161. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    162. >>>>>>> 4e81ea2 (Featire specs) =======
    163. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    164. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    165. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    166. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    167. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    168. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    169. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    170. >>>>>>> 5b7749a (Fix) 2 visit books_path
    171. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    172. =======
    173. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    174. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    175. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    176. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    177. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    178. >>>>>>> 4e81ea2 (Featire specs) =======
    179. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    180. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    181. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    182. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    183. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    184. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    185. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    186. >>>>>>> 5b7749a (Fix) end
    187. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    188. =======
    189. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    190. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    191. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    192. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    193. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    194. >>>>>>> 4e81ea2 (Featire specs) =======
    195. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    196. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    197. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    198. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    199. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    200. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    201. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    202. >>>>>>> 5b7749a (Fix)
    203. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    204. =======
    205. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    206. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    207. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    208. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    209. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    210. >>>>>>> 4e81ea2 (Featire specs) =======
    211. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    212. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    213. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    214. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    215. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    216. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    217. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    218. >>>>>>> 5b7749a (Fix) 1 after do
    219. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    220. =======
    221. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    222. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    223. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    224. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    225. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    226. >>>>>>> 4e81ea2 (Featire specs) =======
    227. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    228. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    229. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    230. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    231. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    232. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    233. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    234. >>>>>>> 5b7749a (Fix) 2 category_one.destroy
    235. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    236. =======
    237. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    238. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    239. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    240. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    241. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    242. >>>>>>> 4e81ea2 (Featire specs) =======
    243. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    244. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    245. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    246. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    247. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    248. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    249. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    250. >>>>>>> 5b7749a (Fix) end
    251. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    252. =======
    253. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    254. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    255. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    256. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    257. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    258. >>>>>>> 4e81ea2 (Featire specs) =======
    259. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    260. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    261. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    262. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    263. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    264. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    265. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    266. >>>>>>> 5b7749a (Fix)
    267. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    268. =======
    269. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    270. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    271. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    272. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    273. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    274. >>>>>>> 4e81ea2 (Featire specs) =======
    275. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    276. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    277. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    278. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    279. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    280. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    281. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    282. >>>>>>> 5b7749a (Fix) 1 it 'show book count for category' do
    283. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    284. =======
    285. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    286. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    287. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    288. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    289. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    290. >>>>>>> 4e81ea2 (Featire specs) =======
    291. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    292. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    293. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    294. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    295. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    296. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    297. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    298. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.size)
    299. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    300. =======
    301. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    302. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    303. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    304. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    305. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    306. >>>>>>> 4e81ea2 (Featire specs) =======
    307. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    308. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    309. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    310. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    311. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    312. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    313. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    314. >>>>>>> 5b7749a (Fix) end
    315. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    316. =======
    317. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    318. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    319. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    320. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    321. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    322. >>>>>>> 4e81ea2 (Featire specs) =======
    323. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    324. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    325. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    326. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    327. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    328. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    329. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    330. >>>>>>> 5b7749a (Fix)
    331. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    332. 1 it 'filter book by category' do
    333. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
    334. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    335. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'filter book by category' do
    336. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
    337. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) click_on category_one.name
    338. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    339. =======
    340. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    341. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    342. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    343. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    344. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    345. >>>>>>> 4e81ea2 (Featire specs) =======
    346. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    347. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    348. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    349. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    350. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    351. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    352. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    353. >>>>>>> 5b7749a (Fix) end
    354. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    355. =======
    356. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    357. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    358. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    359. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    360. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    361. >>>>>>> 4e81ea2 (Featire specs) =======
    362. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    363. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    364. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    365. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    366. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    367. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    368. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    369. >>>>>>> 5b7749a (Fix)
    370. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    371. =======
    372. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    373. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    374. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    375. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    376. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    377. >>>>>>> 4e81ea2 (Featire specs) =======
    378. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    379. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    380. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    381. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    382. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    383. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    384. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    385. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.first.title)
    386. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    387. =======
    388. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    389. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    390. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    391. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    392. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    393. >>>>>>> 4e81ea2 (Featire specs) =======
    394. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    395. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    396. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    397. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    398. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    399. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    400. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    401. >>>>>>> 5b7749a (Fix) end
    402. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    403. =======
    404. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    405. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    406. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    407. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    408. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    409. >>>>>>> 4e81ea2 (Featire specs) =======
    410. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    411. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    412. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    413. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    414. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    415. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    416. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    417. >>>>>>> 5b7749a (Fix) end
    418. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    419. =======
    420. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    421. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    422. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    423. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    424. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    425. >>>>>>> 4e81ea2 (Featire specs) =======
    426. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    427. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    428. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    429. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    430. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    431. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    432. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    433. >>>>>>> 5b7749a (Fix)
    434. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    435. =======
    436. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    437. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    438. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    439. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    440. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    441. >>>>>>> 4e81ea2 (Featire specs) =======
    442. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    443. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    444. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    445. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    446. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    447. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    448. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    449. >>>>>>> 5b7749a (Fix) 1 describe 'filter by all books' do
    450. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    451. =======
    452. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    453. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    454. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    455. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    456. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    457. >>>>>>> 4e81ea2 (Featire specs) =======
    458. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    459. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    460. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    461. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    462. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    463. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    464. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    465. >>>>>>> 5b7749a (Fix) 1 before do
    466. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    467. =======
    468. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    469. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    470. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    471. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    472. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    473. >>>>>>> 4e81ea2 (Featire specs) =======
    474. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    475. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    476. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    477. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    478. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    479. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    480. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    481. >>>>>>> 5b7749a (Fix) 2 category_one.books.create(params)
    482. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    483. 2 category_two.books.create(params)
    484. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    485. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) visit books_path ======= category_two.books.create(params) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit books_path >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) ======= category_two.books.create(params) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= category_two.books.create(params) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 5b7749a (Fix)
    486. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) click_on I18n.t('catalog_page.all') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_on I18n.t('catalog_page.all') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_on I18n.t('catalog_page.all') >>>>>>> 5b7749a (Fix)
    487. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    488. 2 click_on 'All'
    489. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
    490. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    491. =======
    492. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    493. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    494. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    495. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    496. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    497. >>>>>>> 4e81ea2 (Featire specs) =======
    498. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    499. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    500. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    501. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    502. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    503. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    504. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    505. >>>>>>> 5b7749a (Fix)
    506. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    507. =======
    508. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    509. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    510. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    511. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    512. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    513. >>>>>>> 4e81ea2 (Featire specs) =======
    514. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    515. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    516. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    517. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    518. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    519. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    520. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    521. >>>>>>> 5b7749a (Fix) 1 after do
    522. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    523. =======
    524. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    525. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    526. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    527. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    528. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    529. >>>>>>> 4e81ea2 (Featire specs) =======
    530. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    531. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    532. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    533. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    534. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    535. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    536. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    537. >>>>>>> 5b7749a (Fix) 2 category_one.destroy
    538. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    539. =======
    540. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    541. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    542. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    543. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    544. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    545. >>>>>>> 4e81ea2 (Featire specs) =======
    546. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    547. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    548. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    549. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    550. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    551. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    552. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    553. >>>>>>> 5b7749a (Fix) 2 category_two.destroy
    554. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    555. =======
    556. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    557. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    558. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    559. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    560. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    561. >>>>>>> 4e81ea2 (Featire specs) =======
    562. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    563. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    564. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    565. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    566. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    567. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    568. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    569. >>>>>>> 5b7749a (Fix) end
    570. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    571. =======
    572. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    573. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    574. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    575. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    576. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    577. >>>>>>> 4e81ea2 (Featire specs) =======
    578. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    579. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    580. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    581. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    582. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    583. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    584. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    585. >>>>>>> 5b7749a (Fix)
    586. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    587. =======
    588. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    589. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    590. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    591. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    592. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    593. >>>>>>> 4e81ea2 (Featire specs) =======
    594. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    595. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    596. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    597. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    598. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    599. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    600. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    601. >>>>>>> 5b7749a (Fix) 1 it 'shown books for first category' do
    602. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    603. =======
    604. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    605. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    606. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    607. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    608. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    609. >>>>>>> 4e81ea2 (Featire specs) =======
    610. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    611. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    612. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    613. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    614. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    615. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    616. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    617. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.first.title)
    618. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    619. =======
    620. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    621. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    622. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    623. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    624. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    625. >>>>>>> 4e81ea2 (Featire specs) =======
    626. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    627. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    628. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    629. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    630. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    631. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    632. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    633. >>>>>>> 5b7749a (Fix) end
    634. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    635. =======
    636. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    637. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    638. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    639. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    640. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    641. >>>>>>> 4e81ea2 (Featire specs) =======
    642. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    643. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    644. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    645. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    646. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    647. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    648. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    649. >>>>>>> 5b7749a (Fix)
    650. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    651. =======
    652. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    653. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    654. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    655. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    656. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    657. >>>>>>> 4e81ea2 (Featire specs) =======
    658. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    659. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    660. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    661. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    662. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    663. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    664. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    665. >>>>>>> 5b7749a (Fix) 1 it 'shown books for second category' do
    666. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    667. =======
    668. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    669. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    670. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    671. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    672. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    673. >>>>>>> 4e81ea2 (Featire specs) =======
    674. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    675. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    676. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    677. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    678. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    679. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    680. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    681. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_two.books.first.title)
    682. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    683. end
    684. end
    685. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    686. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
    687. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
    688. end
    689. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    690. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    691. =======
    692. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    693. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    694. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    695. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    696. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    697. >>>>>>> 4e81ea2 (Featire specs) =======
    698. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    699. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    700. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    701. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    702. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    703. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    704. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    705. >>>>>>> 5b7749a (Fix) 1 describe 'load_more' do
    706. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    707. =======
    708. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    709. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    710. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    711. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    712. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    713. >>>>>>> 4e81ea2 (Featire specs) =======
    714. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    715. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    716. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    717. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    718. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    719. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    720. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    721. >>>>>>> 5b7749a (Fix) 1 before do
    722. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    723. =======
    724. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    725. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    726. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    727. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    728. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    729. >>>>>>> 4e81ea2 (Featire specs) =======
    730. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    731. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    732. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    733. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    734. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    735. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    736. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    737. >>>>>>> 5b7749a (Fix) 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= 24.times do >>>>>>> 872e675 (Fix) ======= 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 5b7749a (Fix)
    738. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    739. =======
    740. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    741. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    742. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    743. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    744. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    745. >>>>>>> 4e81ea2 (Featire specs) =======
    746. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    747. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    748. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    749. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    750. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    751. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    752. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    753. >>>>>>> 5b7749a (Fix) 72 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) books << create(:book)
    754. end
    755. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= books << FactoryBot.create(:book) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    756. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    757. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    758. 4 =======
    759. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    760. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    761. 4 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    762. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    763. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    764. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    765. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    766. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    767. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    768. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    769. 4 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:books) { [] } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 5b7749a (Fix)
    770. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    771. 1 =======
    772. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    773. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    774. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    775. 4 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    776. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    777. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    778. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    779. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    780. 4 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    781. 4 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    782. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'show books without view more button' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) ======= let(:books) { [] } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:books) { [] } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'show books without view more button' do >>>>>>> 5b7749a (Fix)
    783. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    784. 1 visit books_path
    785. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    786. >>>>>>> d0dc1f1 (Featire specs) =======
    787. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
    788. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
    789. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    790. >>>>>>> 4e81ea2 (Featire specs) =======
    791. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    792. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    793. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    794. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    795. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    796. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    797. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    798. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    799. 1 it 'show books without view more button' do
    800. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    801. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', id: 'view_more', class: 'view_more').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 5b7749a (Fix)
    802. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 5b7749a (Fix)
    803. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    804. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
    805. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
    806. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    807. =======
    808. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    809. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    810. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    811. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    812. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    813. >>>>>>> 4e81ea2 (Featire specs) =======
    814. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    815. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    816. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    817. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    818. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    819. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    820. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    821. >>>>>>> 5b7749a (Fix)
    822. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    823. 1 context 'when view more' do
    824. 1 it 'show books with view more button' do
    825. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    826. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) visit books_path ======= context 'when view more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit books_path >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when view more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when view more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 5b7749a (Fix)
    827. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    828. =======
    829. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    830. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    831. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    832. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    833. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    834. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    835. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    836. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    837. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    838. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    839. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show books with view more button' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    840. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_css('a', class: 'view_more') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_css('a', class: 'view_more') >>>>>>> 5b7749a (Fix)
    841. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    842. 1 expect(page).to have_css('a', class: 'view_more')
    843. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
    844. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    845. =======
    846. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    847. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    848. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    849. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    850. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    851. >>>>>>> 4e81ea2 (Featire specs) =======
    852. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    853. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    854. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    855. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    856. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    857. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    858. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    859. >>>>>>> 5b7749a (Fix)
    860. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    861. =======
    862. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    863. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    864. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    865. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    866. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    867. >>>>>>> 4e81ea2 (Featire specs) =======
    868. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    869. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    870. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    871. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    872. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    873. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    874. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    875. >>>>>>> 5b7749a (Fix) 1 it 'show loaded books', js: true do
    876. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    877. 1 visit books_path
    878. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    879. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'view_more').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'view_more').click >>>>>>> 5b7749a (Fix)
    880. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content(books.last.title) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(books.last.title) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 5b7749a (Fix)
    881. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
    882. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    883. =======
    884. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    885. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    886. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    887. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    888. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    889. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    890. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    891. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    892. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    893. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    894. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
    895. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
    896. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
    897. end
    898. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    899. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    900. =======
    901. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    902. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    903. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    904. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    905. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    906. >>>>>>> 4e81ea2 (Featire specs) =======
    907. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    908. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    909. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    910. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    911. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    912. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    913. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    914. >>>>>>> 5b7749a (Fix) 1 describe 'sort' do
    915. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    916. =======
    917. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    918. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    919. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    920. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    921. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    922. >>>>>>> 4e81ea2 (Featire specs) =======
    923. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    924. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    925. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    926. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    927. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    928. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    929. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    930. >>>>>>> 5b7749a (Fix) 1 shared_examples 'sort test' do
    931. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    932. =======
    933. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    934. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    935. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    936. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    937. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    938. >>>>>>> 4e81ea2 (Featire specs) =======
    939. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    940. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    941. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    942. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    943. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    944. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    945. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    946. >>>>>>> 5b7749a (Fix) 5 it 'sort books' do
    947. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    948. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
    949. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
    950. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    951. 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) create(:book, title: 'Anna', price_cents: 23, ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:book, title: 'Anna', price_cents: 23, >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= create(:book, title: 'Anna', price_cents: 23, >>>>>>> 5b7749a (Fix)
    952. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 872e675 (Fix) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 5b7749a (Fix)
    953. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    954. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    955. ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    956. 5 FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
    957. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    958. >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    959. >>>>>>> 5b7749a (Fix)
    960. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    961. =======
    962. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    963. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    964. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    965. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    966. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    967. >>>>>>> 4e81ea2 (Featire specs) =======
    968. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    969. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    970. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    971. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    972. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    973. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    974. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    975. >>>>>>> 5b7749a (Fix) 5 visit books_path
    976. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    977. =======
    978. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    979. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    980. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    981. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    982. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    983. >>>>>>> 4e81ea2 (Featire specs) =======
    984. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    985. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    986. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    987. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    988. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    989. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    990. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    991. >>>>>>> 5b7749a (Fix)
    992. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    993. =======
    994. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    995. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    996. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
    997. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
    998. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    999. >>>>>>> 4e81ea2 (Featire specs) =======
    1000. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    1001. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    1002. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    1003. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    1004. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    1005. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    1006. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    1007. >>>>>>> 5b7749a (Fix) 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
    1008. id: 'menu').click <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    1009. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
    1010. 5 click_link button
    1011. end
    1012. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
    1013. end
    1014. end
    1015. 1 context 'when sort by title A to Z' do
    1016. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= let(:button) { 'Title: A to Z' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 5b7749a (Fix)
    1017. 2 let(:book_title) { 'Anna' }
    1018. 1 include_examples 'sort test'
    1019. end
    1020. 1 context 'when sort by title Z to A' do
    1021. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= let(:button) { 'Title: Z to A' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 5b7749a (Fix)
    1022. 2 let(:book_title) { 'Zimbabwe' }
    1023. 1 include_examples 'sort test'
    1024. end
    1025. 1 context 'when sort by price High to Low' do
    1026. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= let(:button) { 'Price: High to Low' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 5b7749a (Fix)
    1027. 2 let(:book_title) { 'Zimbabwe' }
    1028. 1 include_examples 'sort test'
    1029. end
    1030. 1 context 'when sort by price Low to High' do
    1031. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= let(:button) { 'Price: Low to High' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 5b7749a (Fix)
    1032. 2 let(:book_title) { 'Anna' }
    1033. 1 include_examples 'sort test'
    1034. end
    1035. 1 context 'when sort by newest' do
    1036. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= let(:button) { 'Newest first' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Newest first' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 5b7749a (Fix)
    1037. 2 let(:book_title) { 'Zimbabwe' }
    1038. 1 include_examples 'sort test'
    1039. end
    1040. end
    1041. end

    spec/feature/cart_spec.rb

    100.0% lines covered

    29 relevant lines. 29 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe 'Cart', type: :feature, js: true do
    3. 5 let(:book) { FactoryBot.create(:book) }
    4. 1 before do
    5. 4 book
    6. 4 visit book_path(book.id)
    7. 4 click_button I18n.t('book_page.add_to_card')
    8. end
    9. 1 describe '#add_book_to_order' do
    10. 1 it 'add book to order' do
    11. 1 within('span', class: 'shop-icon') do
    12. 1 expect(page).to have_content(1)
    13. end
    14. end
    15. end
    16. 1 describe '#quantity_change' do
    17. 1 it 'book quantity inc' do
    18. 1 visit orders_path
    19. 1 within("a#inc#{book.id}.input-link") do
    20. 1 find('i.fa.fa-plus.line-heaght-40').click
    21. end
    22. 1 sleep(2)
    23. 1 expect(find_field("counter#{book.id}").value).to eq('2')
    24. end
    25. 1 it 'book quantity dec' do
    26. 1 visit orders_path
    27. 1 within("a#dec#{book.id}.input-link") do
    28. 1 find('i.fa.fa-minus.line-heaght-40').click
    29. end
    30. 1 sleep(2)
    31. 1 expect(find_field("counter#{book.id}").value).to eq('0')
    32. end
    33. end
    34. 1 describe '#remove_book_from_cart' do
    35. 1 it 'book quantity change' do
    36. 1 visit orders_path
    37. 1 find('button.close.general-cart-close').click
    38. 1 expect(page).to have_content(I18n.t('order.messages.delete'))
    39. end
    40. end
    41. end

    spec/feature/coupon_spec.rb

    100.0% lines covered

    30 relevant lines. 30 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 require_relative '../support/shared_context'
    3. 1 RSpec.describe 'Coupon', type: :feature, js: true do
    4. 1 include_context 'with api request authentication helper methods'
    5. 1 include_context 'with api request global before and after hooks'
    6. 5 let(:user) { FactoryBot.create(:user) }
    7. 4 let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
    8. 5 let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
    9. 5 let(:book) { FactoryBot.create(:book, price_cents: 1234) }
    10. 5 let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
    11. 1 before do
    12. 4 sign_in(user)
    13. 4 order
    14. 4 order_book
    15. 4 visit orders_path
    16. end
    17. 1 describe '#valid coupon' do
    18. 1 before do
    19. 3 fill_in 'input', with: coupon.code
    20. 3 click_button I18n.t('order.apply')
    21. end
    22. 1 it 'sub price' do
    23. 1 expect(page).to have_content("SubTotal:\n€ 12.34")
    24. end
    25. 1 it 'use coupon' do
    26. 1 expect(page).to have_content("Coupon:\n€ 1.85")
    27. end
    28. 1 it 'count price with coupon' do
    29. 1 expect(page).to have_content('Order Total: € 10.49')
    30. end
    31. end
    32. 1 describe '#invalid coupon' do
    33. 1 it 'show error message' do
    34. 1 fill_in 'input', with: 'dasdasdqe1243wasad'
    35. 1 click_button I18n.t('order.apply')
    36. 1 expect(page).to have_content(I18n.t('order.coupon.error'))
    37. end
    38. end
    39. end

    spec/feature/home_spec.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 49 relevant lines. 49 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Home', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 1 describe 'Get Started' do
    5. 1 it 'on click move to catalog page' do
    6. 1 visit root_path
    7. 1 click_on 'Get Started'
    8. 1 expect(page).to have_content('Catalog')
    9. end
    10. end
    11. 1 describe 'navbar' do
    12. 2 let(:books_category) { create(:books_category) }
    13. 1 it 'on click home move to root-path' do
    14. 1 visit books_path
    15. 1 find('a', id: 'root').click
    16. 1 expect(page).to have_content('Get Started')
    17. end
    18. 1 it 'on click category name move to root-path with books that belong to this category' do
    19. 1 books_category
    20. 1 visit root_path
    21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
    22. 1 within('ul', id: 'nav') do
    23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
    24. end
    25. 1 expect(page).to have_content(books_category.category.books.first.title)
    26. end
    27. 1 context 'when guest' do
    28. 1 it 'on click login go to login page' do
    29. 1 visit root_path
    30. 1 within 'div', class: 'visible-xs' do
    31. 1 click_link I18n.t('header.log_in')
    32. end
    33. 1 expect(page).to have_content(I18n.t('header.log_in'))
    34. end
    35. 1 it 'on click sing up go to sing up page' do
    36. 1 visit root_path
    37. 1 within 'div', class: 'visible-xs' do
    38. 1 click_link I18n.t('header.sing_up')
    39. end
    40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
    41. end
    42. end
    43. 1 context 'when user', js: true do
    44. 4 let(:user) { create(:user) }
    45. 1 before do
    46. 3 sign_in(user)
    47. end
    48. 1 it 'on click account show settings' do
    49. 1 visit root_path
    50. 1 click_on I18n.t('header.account')
    51. 1 expect(page).to have_content(I18n.t('header.settings'))
    52. end
    53. 1 it 'on click account show log_out' do
    54. 1 visit root_path
    55. 1 click_on I18n.t('header.account')
    56. 1 expect(page).to have_content(I18n.t('header.log_out'))
    57. end
    58. 1 it 'log_out' do
    59. 1 visit root_path
    60. 1 click_on I18n.t('header.account')
    61. 1 click_on(I18n.t('header.log_out'), match: :first)
    62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
    63. end
    64. end
    65. end
    66. end

    spec/feature/login_spec.rb

    >>>>>>> a5d032d (Fix) 100.0% lines covered

    <<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Login', type: :feature do
    2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
    3. 1 describe '#login' do
    4. 1 before do
    5. 2 visit new_user_session_path
    6. end
    7. 1 context 'when successfully login' do
    8. 1 it 'login' do
    9. 1 within 'form', class: 'new_user', id: 'new_user' do
    10. 1 fill_in 'user_email', with: user_second.email
    11. 1 fill_in 'user_password', with: user_second.password
    12. 1 click_on I18n.t('header.log_in')
    13. end
    14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
    15. end
    16. end
    17. 1 context 'when unsuccessfully login' do
    18. 1 it 'didn`t login' do
    19. 1 within 'form', class: 'new_user', id: 'new_user' do
    20. 1 fill_in 'user_email', with: user_second.email
    21. 1 fill_in 'user_password', with: 'wrong_password'
    22. 1 click_on I18n.t('header.log_in')
    23. end
    24. 1 expect(page).to have_text 'Invalid Email or password.'
    25. end
    26. end
    27. end
    28. end

    spec/feature/new_password_spec.rb

    100.0% lines covered

    13 relevant lines. 13 lines covered and 0 lines missed.
        
    1. 1 require_relative '../rails_helper'
    2. 1 require_relative '../support/shared_context'
    3. 1 RSpec.describe 'New Password', type: :feature do
    4. 3 let(:user) { FactoryBot.create(:user) }
    5. 1 describe '#new_password' do
    6. 1 it 'change password' do
    7. 1 user.reset_password('newPassword', 'newPassword')
    8. 1 expect(user.password).to eq('newPassword')
    9. end
    10. 1 it 'not validate password' do
    11. 1 visit new_user_password_path
    12. 1 fill_in 'email', with: user.email
    13. 1 click_on I18n.t('login.send_instructions')
    14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
    15. end
    16. end
    17. end

    spec/feature/registration_spec.rb

    100.0% lines covered

    29 relevant lines. 29 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Registration', type: :feature do
    2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
    3. 1 describe '#sing_up' do
    4. 1 before do
    5. 3 visit new_user_registration_path
    6. end
    7. 1 context 'when successfully sing_up' do
    8. 1 it 'sing_up users' do
    9. 1 within 'form', class: 'new_user', id: 'new_user' do
    10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
    11. 1 fill_in 'user_password', with: user.password
    12. 1 fill_in 'user_password_confirmation', with: user.password
    13. 1 click_on I18n.t('header.sing_up')
    14. end
    15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
    16. end
    17. end
    18. 1 context 'when users is already exits' do
    19. 1 it 'sing_up users' do
    20. 1 within 'form', class: 'new_user', id: 'new_user' do
    21. 1 fill_in 'user_email', with: user.email
    22. 1 fill_in 'user_password', with: user.password
    23. 1 fill_in 'user_password_confirmation', with: user.password
    24. 1 click_on I18n.t('header.sing_up')
    25. end
    26. 1 expect(page).to have_text('Email has already been taken')
    27. end
    28. end
    29. 1 context 'when unsuccessfully sing_up' do
    30. 1 it 'didn`t sing_up' do
    31. 1 within 'form', class: 'new_user', id: 'new_user' do
    32. 1 fill_in 'user_email', with: FFaker::Internet.email
    33. 1 fill_in 'user_password', with: 'password'
    34. 1 fill_in 'user_password_confirmation', with: 'wrong'
    35. 1 click_on I18n.t('header.sing_up')
    36. end
    37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
    38. end
    39. end
    40. end
    41. end

    spec/feature/review_spec.rb

    100.0% lines covered

    28 relevant lines. 28 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Review', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 3 let(:user) { create(:user).decorate }
    5. 3 let(:book) { create(:book).decorate }
    6. 1 before do
    7. 2 sign_in(user)
    8. 2 visit book_path(book)
    9. end
    10. 1 shared_examples 'review' do
    11. 2 it 'review' do
    12. 2 find('i', id: rating).click
    13. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
    14. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
    15. 2 click_on I18n.t('review.post')
    16. 2 expect(page).to have_content(result)
    17. end
    18. end
    19. 1 describe '#post review', js: true do
    20. 1 context 'when review posted' do
    21. 2 let(:rating) { "star#{rand(1..5)}" }
    22. 2 let(:title_words) { 3 }
    23. 2 let(:body_words) { 5 }
    24. 2 let(:result) { user.name_or_email }
    25. 1 include_examples 'review'
    26. end
    27. 1 context 'when review not been posted' do
    28. 2 let(:rating) { "star#{rand(1..5)}" }
    29. 2 let(:title_words) { 80 }
    30. 2 let(:body_words) { 30 }
    31. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
    32. 1 include_examples 'review'
    33. end
    34. end
    35. end

    spec/feature/settings_spec.rb

    100.0% lines covered

    34 relevant lines. 34 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Settings', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 4 let(:user) { create(:user) }
    5. 1 before do
    6. 3 sign_in(user)
    7. 3 visit edit_user_path(user.id)
    8. 3 click_link I18n.t('settings.privacy')
    9. end
    10. 1 describe '#email_change' do
    11. 1 it 'change email' do
    12. 1 within('div', id: 'email') do
    13. 1 fill_in :email, with: FFaker::Internet.email
    14. 1 click_on I18n.t('settings.save')
    15. end
    16. 1 user.confirm
    17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
    18. end
    19. end
    20. 1 describe '#password_change' do
    21. 1 context 'when error' do
    22. 1 it 'didnt change password' do
    23. 1 within('div', id: 'password') do
    24. 1 fill_in :current_password, with: user.password
    25. 1 fill_in :password, with: 'newPassword'
    26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
    27. 1 click_on I18n.t('settings.save')
    28. end
    29. 1 user.confirm
    30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
    31. end
    32. end
    33. 1 context 'when successful' do
    34. 1 it 'didnt change password' do
    35. 1 within('div', id: 'password') do
    36. 1 fill_in :current_password, with: user.password
    37. 1 fill_in :password, with: 'newPassword'
    38. 1 fill_in :password_confirmation, with: 'newPassword'
    39. 1 click_on I18n.t('settings.save')
    40. end
    41. 1 user.confirm
    42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
    43. end
    44. end
    45. end
    46. end

    spec/feature/shipping_spec.rb

    73.08% lines covered

    26 relevant lines. 19 lines covered and 7 lines missed.
        
    1. 1 RSpec.describe 'Shipping', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 2 let(:user) { FactoryBot.create(:user) }
    5. 1 let(:attributes_for) { attributes_for(:shipping) }
    6. 1 describe '#fill_in', js: true do
    7. 1 it 'fill in shipping' do
    8. 1 sign_in(user)
    9. 1 visit edit_user_path(user.id)
    10. 1 within('div#shipping.col-md-5.mb-40') do
    11. 1 find_all('div', class: 'form-group')[0] do
    12. fill_in :first_name, with: attributes_for[:first_name]
    13. end
    14. 1 find_all('div', class: 'form-group')[1] do
    15. fill_in :last_name, with: attributes_for[:last_name]
    16. end
    17. 1 find_all('div', class: 'form-group')[2] do
    18. fill_in :address, with: attributes_for[:address]
    19. end
    20. 1 find_all('div', class: 'form-group')[3] do
    21. fill_in :city, with: attributes_for[:city]
    22. end
    23. 1 find_all('div', class: 'form-group')[4] do
    24. fill_in :zip, with: attributes_for[:zip]
    25. end
    26. 1 find_all('div', class: 'form-group')[5] do
    27. fill_in :country, with: attributes_for[:country]
    28. end
    29. 1 find_all('div', class: 'form-group')[6] do
    30. fill_in :phone, with: attributes_for[:phone]
    31. end
    32. 1 click_on I18n.t('settings.save')
    33. end
    34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
    35. end
    36. end
    37. end

    spec/feature/user_spec.rb

    100.0% lines covered

    42 relevant lines. 42 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'User', type: :feature do
    2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
    3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
    4. 1 describe '#sing_up' do
    5. 1 context 'when successfully sing_up' do
    6. 1 before do
    7. 1 visit new_user_registration_path
    8. 1 within 'form', class: 'new_user', id: 'new_user' do
    9. 1 fill_in 'user_email', with: user.email
    10. 1 fill_in 'user_password', with: user.password
    11. 1 fill_in 'user_password_confirmation', with: user.password
    12. 1 click_on I18n.t('header.sing_up')
    13. end
    14. end
    15. 1 it 'sing_up user' do
    16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
    17. end
    18. end
    19. 1 context 'when unsuccessfully sing_up' do
    20. 1 it 'didn`t sing_up' do
    21. 1 visit new_user_registration_path
    22. 1 within 'form', class: 'new_user', id: 'new_user' do
    23. 1 fill_in 'user_email', with: FFaker::Internet.email
    24. 1 fill_in 'user_password', with: 'wrong'
    25. 1 fill_in 'user_password_confirmation', with: 'wrong'
    26. 1 click_on I18n.t('header.sing_up')
    27. end
    28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
    29. end
    30. end
    31. end
    32. 1 describe '#login' do
    33. 1 before do
    34. 2 user_second.confirm
    35. end
    36. 1 context 'when successfully login' do
    37. 1 it 'login' do
    38. 1 visit new_user_session_path
    39. 1 within 'form', class: 'new_user', id: 'new_user' do
    40. 1 fill_in 'user_email', with: user_second.email
    41. 1 fill_in 'user_password', with: user_second.password
    42. 1 click_on I18n.t('header.log_in')
    43. end
    44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
    45. end
    46. end
    47. 1 context 'when unsuccessfully login' do
    48. 1 it 'didn`t login' do
    49. 1 visit new_user_session_path
    50. 1 within 'form', class: 'new_user', id: 'new_user' do
    51. 1 fill_in 'user_email', with: user_second.email
    52. 1 fill_in 'user_password', with: 'wrong_password'
    53. 1 click_on I18n.t('header.log_in')
    54. end
    55. 1 expect(page).to have_text 'Invalid Email or password.'
    56. end
    57. end
    58. end
    59. end

    spec/models/admin_user_spec.rb

    100.0% lines covered

    5 relevant lines. 5 lines covered and <<<<<<< HEAD ======= 20 relevant lines. 20 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe AdminUser, type: :model do ======= RSpec.describe 'Homes', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe AdminUser, type: :model do >>>>>>> 5b7749a (Fix)
    3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'when validations' do ======= describe 'Get Started' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'Get Started' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'Get Started' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 5b7749a (Fix)
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    5. 2 =======
    6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
    7. 1 >>>>>>> 752f0c0 (Featire specs) =======
    8. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    9. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    10. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    11. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    12. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    13. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    14. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    15. 2 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:email) } ======= it 'on click move to catalog page' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'on click move to catalog page' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:email) } >>>>>>> 5b7749a (Fix)
    16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    17. 2 =======
    18. 1 >>>>>>> d0dc1f1 (Featire specs) =======
    19. 1 >>>>>>> 752f0c0 (Featire specs) =======
    20. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    21. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    22. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    23. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    24. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    25. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    26. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    27. 2 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:password) } ======= visit root_path >>>>>>> d0dc1f1 (Featire specs) ======= visit root_path >>>>>>> 752f0c0 (Featire specs) ======= visit root_path >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit root_path >>>>>>> 08edf50 (Featire specs) ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit root_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit root_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:password) } >>>>>>> 5b7749a (Fix)
    28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    29. 1 context 'when associations' do
    30. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
    31. 2 it { is_expected.to have_many(:books).through(:authors_books) }
    32. end
    33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
    34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    35. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    36. <<<<<<< HEAD
    37. 1 describe 'navbar' do
    38. 2 let(:books_category) { FactoryBot.create(:books_category) }
    39. 1 it 'on click home move to root-path' do
    40. 1 visit books_path
    41. 1 find('a', id: 'root').click
    42. 1 expect(page).to have_content('Get Started')
    43. end
    44. 1 it 'on click category name move to root-path with books that belong to this category' do
    45. 1 books_category
    46. 1 visit root_path
    47. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
    48. 1 within('ul', id: 'nav') do
    49. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
    50. end
    51. 1 expect(page).to have_content(books_category.category.books.first.title)
    52. end
    53. end
    54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    55. >>>>>>> 5b7749a (Fix) end

    spec/models/author_spec.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 5b7749a (Fix) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Author, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 5b7749a (Fix)
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    3. 1 describe 'author' do
    4. 1 context 'when validations' do
    5. 2 it { is_expected.to validate_presence_of(:first_name) }
    6. 2 it { is_expected.to validate_presence_of(:last_name) }
    7. end
    8. <<<<<<< HEAD =======
    9. >>>>>>> d0dc1f1 (Featire specs) =======
    10. >>>>>>> 752f0c0 (Featire specs) =======
    11. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    12. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    13. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    14. >>>>>>> 08edf50 (Featire specs) =======
    15. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    16. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    17. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    18. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    19. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    21. =======
    22. >>>>>>> d0dc1f1 (Featire specs) =======
    23. >>>>>>> 752f0c0 (Featire specs) =======
    24. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    26. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    27. >>>>>>> 08edf50 (Featire specs) =======
    28. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    29. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    30. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    31. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    32. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    33. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'when associations' do ======= RSpec.describe Author, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 5b7749a (Fix)
    34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    35. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    36. 1 describe 'author' do
    37. 1 context 'when validations' do
    38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    39. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:authors_books).dependent(:destroy) } >>>>>>> 5b7749a (Fix)
    40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    41. =======
    42. >>>>>>> d0dc1f1 (Featire specs) =======
    43. >>>>>>> 752f0c0 (Featire specs) =======
    44. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    45. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    46. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    47. >>>>>>> 08edf50 (Featire specs) =======
    48. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    49. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    50. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    51. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    52. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    53. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:books).through(:authors_books) } ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:books).through(:authors_books) } >>>>>>> 5b7749a (Fix)
    54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    55. =======
    56. >>>>>>> d0dc1f1 (Featire specs) =======
    57. >>>>>>> 752f0c0 (Featire specs) =======
    58. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    59. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    60. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    61. >>>>>>> 08edf50 (Featire specs) =======
    62. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    63. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    64. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    65. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    66. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    67. >>>>>>> 5b7749a (Fix) end
    68. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    69. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    70. 1 context 'when associations' do
    71. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
    72. 2 it { is_expected.to have_many(:books).through(:authors_books) }
    73. end
    74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    75. >>>>>>> 5b7749a (Fix) end
    76. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    77. =======
    78. >>>>>>> d0dc1f1 (Featire specs) =======
    79. >>>>>>> 752f0c0 (Featire specs) =======
    80. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    81. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    82. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    83. >>>>>>> 08edf50 (Featire specs) =======
    84. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    85. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    86. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    87. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    88. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    89. >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) end

    spec/models/authors_book_spec.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 5b7749a (Fix) ======= 8 relevant lines. 8 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) require 'rails_helper'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) RSpec.describe AuthorsBook, type: :model do
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    4. =======
    5. >>>>>>> d0dc1f1 (Featire specs) =======
    6. >>>>>>> 752f0c0 (Featire specs) =======
    7. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    10. >>>>>>> 08edf50 (Featire specs) =======
    11. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    12. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    13. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    14. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    15. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    16. >>>>>>> 5b7749a (Fix) =======
    17. >>>>>>> c7a726c5 (Rebased) 1 describe 'authors_book' do
    18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    19. =======
    20. >>>>>>> d0dc1f1 (Featire specs) =======
    21. >>>>>>> 752f0c0 (Featire specs) =======
    22. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    23. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    24. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    25. >>>>>>> 08edf50 (Featire specs) =======
    26. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    27. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    28. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    29. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    30. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    31. >>>>>>> 5b7749a (Fix) =======
    32. >>>>>>> c7a726c5 (Rebased) 1 context 'when validations' do
    33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
    34. 2 it { is_expected.to validate_presence_of(:book) }
    35. 2 it { is_expected.to validate_presence_of(:author) }
    36. end
    37. 1 context 'when associations' do
    38. 2 it { is_expected.to belong_to(:author) }
    39. <<<<<<< HEAD 2 it { is_expected.to belong_to(:book) }
    40. end
    41. end
    42. end

    spec/models/billing_spec.rb

    100.0% lines covered

    20 relevant lines. 20 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Billing, type: :model do
    2. 1 describe 'billing' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
    5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
    6. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    7. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } >>>>>>> 5b7749a (Fix)
    8. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } >>>>>>> 5b7749a (Fix)
    9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    10. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
    11. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
    12. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
    13. <<<<<<< HEAD =======
    14. >>>>>>> d0dc1f1 (Featire specs) =======
    15. >>>>>>> 752f0c0 (Featire specs) =======
    16. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    17. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    19. >>>>>>> 08edf50 (Featire specs) =======
    20. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    21. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    22. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    23. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    24. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
    25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    26. =======
    27. >>>>>>> d0dc1f1 (Featire specs) =======
    28. >>>>>>> 752f0c0 (Featire specs) =======
    29. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    30. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    31. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    32. >>>>>>> 08edf50 (Featire specs) =======
    33. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    34. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    35. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    36. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    37. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    38. >>>>>>> 5b7749a (Fix)
    39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    40. 1 context 'when not validations' do
    41. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
    42. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
    43. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
    44. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
    45. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
    46. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
    47. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
    48. end
    49. <<<<<<< HEAD =======
    50. >>>>>>> d0dc1f1 (Featire specs) =======
    51. >>>>>>> 752f0c0 (Featire specs) =======
    52. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    53. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    55. >>>>>>> 08edf50 (Featire specs) =======
    56. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    57. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    58. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    59. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    60. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 1 context 'when associations' do
    61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    62. =======
    63. >>>>>>> d0dc1f1 (Featire specs) =======
    64. >>>>>>> 752f0c0 (Featire specs) =======
    65. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    66. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    68. >>>>>>> 08edf50 (Featire specs) =======
    69. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    70. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    71. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    72. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    73. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    74. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to belong_to(:user) } ======= it { is_expected.to belong_to(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:user) } >>>>>>> 5b7749a (Fix)
    75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    76. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    77. ======= >>>>>>> c7a726c5 (Rebased) 2 it { is_expected.to belong_to(:book) }
    78. <<<<<<< HEAD
    79. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    80. >>>>>>> 5b7749a (Fix) =======
    81. >>>>>>> c7a726c5 (Rebased) end
    82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    83. =======
    84. >>>>>>> d0dc1f1 (Featire specs) =======
    85. >>>>>>> 752f0c0 (Featire specs) =======
    86. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    87. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    88. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    89. >>>>>>> 08edf50 (Featire specs) =======
    90. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    91. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    92. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    93. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    94. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    95. >>>>>>> 5b7749a (Fix) =======
    96. >>>>>>> c7a726c5 (Rebased) end
    97. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    98. =======
    99. >>>>>>> d0dc1f1 (Featire specs) =======
    100. >>>>>>> 752f0c0 (Featire specs) =======
    101. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    102. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    103. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    104. >>>>>>> 08edf50 (Featire specs) =======
    105. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    106. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    107. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    108. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    109. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    110. >>>>>>> 5b7749a (Fix) =======
    111. end

    spec/models/billing_spec.rb

    100.0% lines covered

    20 relevant lines. 20 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Billing, type: :model do
    2. 1 describe 'billing' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
    5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
    6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
    7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
    8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
    9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
    10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
    11. end
    12. 1 context 'when not validations' do
    13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
    14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
    15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
    16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
    17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
    18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
    19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
    20. end
    21. 1 context 'when associations' do
    22. 2 it { is_expected.to belong_to(:user) }
    23. end
    24. end
    25. >>>>>>> c7a726c5 (Rebased) end

    spec/models/book_spec.rb

    100.0% lines covered

    16 relevant lines. 16 lines covered and 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Book, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Book, type: :model do >>>>>>> 5b7749a (Fix)
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    3. 1 =======
    4. >>>>>>> d0dc1f1 (Featire specs) =======
    5. >>>>>>> 752f0c0 (Featire specs) =======
    6. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    7. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    9. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    10. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    11. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    12. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    13. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe 'books' do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= describe 'books' do >>>>>>> 5b7749a (Fix)
    14. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> c7a726c5 (Rebased) RSpec.describe Book, type: :model do
    15. 1 describe 'books' do
    16. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) context 'when validations' do
    17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
    18. 2 it { is_expected.to validate_presence_of(:title) }
    19. 2 it { is_expected.to validate_presence_of(:description) }
    20. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    21. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } >>>>>>> 5b7749a (Fix)
    22. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:year_of_publication) } ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 5b7749a (Fix)
    23. =======
    24. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) } ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:quantity) } >>>>>>> 5b7749a (Fix) ======= it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } >>>>>>> c7a726c5 (Rebased)
    25. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:materials) } ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:materials) } >>>>>>> 5b7749a (Fix)
    26. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) }
    27. 2 it { is_expected.to validate_presence_of(:materials) }
    28. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) it { is_expected.to validate_presence_of(:dimensions) }
    29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    30. =======
    31. >>>>>>> d0dc1f1 (Featire specs) =======
    32. >>>>>>> 752f0c0 (Featire specs) =======
    33. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    34. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    36. >>>>>>> 08edf50 (Featire specs) =======
    37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    38. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    40. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    41. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    42. >>>>>>> 5b7749a (Fix) =======
    43. >>>>>>> c7a726c5 (Rebased) end
    44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    45. =======
    46. >>>>>>> d0dc1f1 (Featire specs) =======
    47. >>>>>>> 752f0c0 (Featire specs) =======
    48. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    49. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    50. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    51. >>>>>>> 08edf50 (Featire specs) =======
    52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    53. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    54. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    55. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    56. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    57. >>>>>>> 5b7749a (Fix) =======
    58. >>>>>>> c7a726c5 (Rebased)
    59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    60. =======
    61. >>>>>>> d0dc1f1 (Featire specs) =======
    62. >>>>>>> 752f0c0 (Featire specs) =======
    63. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    64. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    65. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    66. >>>>>>> 08edf50 (Featire specs) =======
    67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    68. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    69. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    70. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    71. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    72. >>>>>>> 5b7749a (Fix) =======
    73. >>>>>>> c7a726c5 (Rebased) 1 context 'when associations' do
    74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    75. =======
    76. >>>>>>> d0dc1f1 (Featire specs) =======
    77. >>>>>>> 752f0c0 (Featire specs) =======
    78. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    79. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    81. >>>>>>> 08edf50 (Featire specs) =======
    82. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    83. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    84. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    85. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    86. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    87. >>>>>>> 5b7749a (Fix) =======
    88. >>>>>>> c7a726c5 (Rebased) 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
    89. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    90. =======
    91. >>>>>>> d0dc1f1 (Featire specs) =======
    92. >>>>>>> 752f0c0 (Featire specs) =======
    93. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    94. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    95. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    96. >>>>>>> 08edf50 (Featire specs) =======
    97. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    98. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    99. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    100. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    101. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    102. >>>>>>> 5b7749a (Fix) =======
    103. >>>>>>> c7a726c5 (Rebased) 2 it { is_expected.to have_many(:authors).through(:authors_books) }
    104. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    105. =======
    106. >>>>>>> d0dc1f1 (Featire specs) =======
    107. >>>>>>> 752f0c0 (Featire specs) =======
    108. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    109. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    110. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    111. >>>>>>> 08edf50 (Featire specs) =======
    112. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    113. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    114. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    115. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    116. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    117. >>>>>>> 5b7749a (Fix) =======
    118. >>>>>>> c7a726c5 (Rebased)
    119. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    120. =======
    121. >>>>>>> d0dc1f1 (Featire specs) =======
    122. >>>>>>> 752f0c0 (Featire specs) =======
    123. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    124. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    125. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    126. >>>>>>> 08edf50 (Featire specs) =======
    127. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    128. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    129. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    130. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    131. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    132. >>>>>>> 5b7749a (Fix) =======
    133. >>>>>>> c7a726c5 (Rebased) 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
    134. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
    135. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
    136. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
    137. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:reviews).dependent(:destroy) } >>>>>>> 5b7749a (Fix) ======= it { is_expected.to have_many(:reviews).dependent(:destroy) } >>>>>>> c7a726c5 (Rebased)
    138. end
    139. end
    140. end

    spec/models/books_category_spec.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) 8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe BooksCategory, type: :model do
    2. 1 describe 'books_categories' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:book) }
    5. 2 it { is_expected.to validate_presence_of(:category) }
    6. end
    7. 1 context 'when associations' do
    8. 2 it { is_expected.to belong_to(:category) }
    9. 2 it { is_expected.to belong_to(:book) }
    10. end
    11. end
    12. end

    spec/models/category_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Category, type: :model do
    2. 1 describe 'category' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:name) }
    5. end
    6. 1 context 'when associations' do
    7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
    8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
    9. end
    10. end
    11. end
    <<<<<<< HEAD

    spec/models/order_spec.rb

    =======

    spec/models/review_spec.rb

    >>>>>>> c7a726c5 (Rebased)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 6 relevant lines. 6 lines covered and >>>>>>> 5b7749a (Fix) ======= 14 relevant lines. 14 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Review, type: :model do ======= RSpec.describe BooksCategory, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Order, type: :model do ======= RSpec.describe Review, type: :model do >>>>>>> c7a726c5 (Rebased)
    3. 1 <<<<<<< HEAD describe 'order' do ======= describe 'review' do >>>>>>> c7a726c5 (Rebased)
    4. 1 context 'when associations' do
    5. 2 <<<<<<< HEAD it { is_expected.to have_many(:order_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c7a726c5 (Rebased)
    6. 2 <<<<<<< HEAD it { is_expected.to have_many(:books).through(:order_books) } ======= it { is_expected.to validate_presence_of(:body) }
    7. 2 it { is_expected.to validate_presence_of(:rating) }
    8. 2 it { is_expected.to validate_presence_of(:verified) }
    9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
    10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
    11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
    12. end
    13. 1 context 'when associations' do
    14. 2 it { is_expected.to belong_to(:book) }
    15. 2 it { is_expected.to belong_to(:user) }
    16. end
    17. end
    18. end

    spec/models/shipping_spec.rb

    100.0% lines covered

    20 relevant lines. 20 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Shipping, type: :model do
    2. 1 describe 'shipping' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
    5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
    6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
    7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
    8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
    9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
    10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
    11. end
    12. 1 context 'when not validations' do
    13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
    14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
    15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
    16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
    17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
    18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
    19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
    20. end
    21. 1 context 'when associations' do
    22. 2 it { is_expected.to belong_to(:user) }
    23. end
    24. end
    25. end

    spec/models/user_spec.rb

    100.0% lines covered

    9 relevant lines. 9 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe User, type: :model do
    2. 1 let(:user) { FactoryBot.create(:user) }
    3. 1 describe 'author' do
    4. 1 context 'when validations' do
    5. 2 it { is_expected.to validate_presence_of(:email) }
    6. 2 it { is_expected.to validate_presence_of(:password) } >>>>>>> c7a726c5 (Rebased)
    7. end
    8. end
    9. end

    spec/models/review_spec.rb

    100.0% lines covered

    14 relevant lines. 14 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe Review, type: :model do >>>>>>> 5b7749a (Fix)
    3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe 'review' do ======= describe 'books_categories' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'books_categories' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'books_categories' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= describe 'review' do >>>>>>> 5b7749a (Fix)
    4. 1 context 'when validations' do
    5. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:title) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 5b7749a (Fix)
    6. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) it { is_expected.to validate_presence_of(:body) }
    7. 2 it { is_expected.to validate_presence_of(:rating) }
    8. 2 it { is_expected.to validate_presence_of(:verified) }
    9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
    10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
    11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
    12. end
    13. 1 context 'when associations' do
    14. 2 it { is_expected.to belong_to(:book) }
    15. 2 it { is_expected.to belong_to(:user) }
    16. end
    17. end
    18. end

    spec/models/shipping_spec.rb

    100.0% lines covered

    20 relevant lines. 20 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Shipping, type: :model do
    2. 1 describe 'shipping' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
    5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
    6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
    7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
    8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
    9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
    10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
    11. end
    12. 1 context 'when not validations' do
    13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
    14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
    15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
    16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
    17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
    18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
    19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
    20. end
    21. 1 context 'when associations' do
    22. 2 it { is_expected.to belong_to(:user) }
    23. end
    24. end
    25. end

    spec/models/user_spec.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe User, type: :model do
    2. 1 describe 'author' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:email) }
    5. 2 it { is_expected.to validate_presence_of(:password) } <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    6. end
    7. <<<<<<< HEAD
    8. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'with associations' do ======= context 'when associations' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when associations' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when associations' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when associations' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= context 'with associations' do >>>>>>> c7a726c5 (Rebased)
    9. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_one(:billing) } ======= it { is_expected.to belong_to(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_one(:billing) } >>>>>>> c7a726c5 (Rebased)
    10. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_one(:shipping) } ======= it { is_expected.to belong_to(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_one(:shipping) } >>>>>>> c7a726c5 (Rebased)
    11. end
    12. end
    13. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)

    spec/queryes/book_query_spec.rb

    =======

    spec/models/category_spec.rb

    >>>>>>> d0dc1f1 (Featire specs) =======

    spec/models/category_spec.rb

    >>>>>>> 752f0c0 (Featire specs) =======

    spec/models/category_spec.rb

    >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

    spec/models/category_spec.rb

    >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

    spec/models/category_spec.rb

    >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======

    spec/models/category_spec.rb

    >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======

    spec/models/category_spec.rb

    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======

    spec/models/category_spec.rb

    >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======

    spec/models/category_spec.rb

    >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======

    spec/queryes/book_query_spec.rb

    >>>>>>> c7a726c5 (Rebased)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 45 relevant lines. 45 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 45 relevant lines. 45 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe BookQuery do ======= RSpec.describe Category, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe BookQuery do >>>>>>> c7a726c5 (Rebased)
    3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) shared_examples 'sort test' do ======= describe 'category' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'category' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'category' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'category' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= shared_examples 'sort test' do >>>>>>> c7a726c5 (Rebased)
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    5. 5 =======
    6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
    7. 1 >>>>>>> 752f0c0 (Featire specs) =======
    8. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    9. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    10. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    11. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    12. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    13. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    14. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    15. 5 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'sort' do ======= context 'when validations' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when validations' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when validations' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when validations' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'sort' do >>>>>>> c7a726c5 (Rebased)
    16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    17. 5 =======
    18. 2 >>>>>>> d0dc1f1 (Featire specs) =======
    19. 2 >>>>>>> 752f0c0 (Featire specs) =======
    20. 2 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    21. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    22. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    23. 2 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    24. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    25. 2 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    26. 2 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    27. 5 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) books ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= books >>>>>>> c7a726c5 (Rebased)
    28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    29. 5 expect(test).to eq(result)
    30. =======
    31. >>>>>>> d0dc1f1 (Featire specs) =======
    32. >>>>>>> 752f0c0 (Featire specs) =======
    33. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    34. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
    36. >>>>>>> 08edf50 (Featire specs) =======
    37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    38. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    40. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    41. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    42. 5 >>>>>>> c7a726c5 (Rebased) expect(test).to eq(result)
    43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    44. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    45. end
    46. <<<<<<< HEAD
    47. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    48. >>>>>>> c7a726c5 (Rebased) end
    49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> c7a726c5 (Rebased)
    50. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages)

    spec/models/user_spec.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe User, type: :model do
    3. 1 pending "add some examples to (or delete) #{__FILE__}"
    4. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)

    spec/rails_helper.rb

    87.5% lines covered

    16 relevant lines. 14 lines covered and 2 lines missed.
        
    1. 1 require 'spec_helper'
    2. 1 ENV['RAILS_ENV'] ||= 'test'
    3. 1 require_relative '../config/environment'
    4. 1 abort('The Rails environment is running in production mode!') if Rails.env.production?
    5. 1 require 'rspec/rails'
    6. 1 require 'shoulda-matchers'
    7. ======= >>>>>>> 5b7749a (Fix)
    8. 1 context 'with associations' do
    9. 2 it { is_expected.to have_one(:billing) }
    10. 2 it { is_expected.to have_one(:shipping) }
    11. end
    12. end
    13. end

    spec/queryes/book_query_spec.rb

    100.0% lines covered

    45 relevant lines. 45 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe BookQuery do
    3. 1 shared_examples 'sort test' do
    4. 5 it 'sort' do
    5. 5 books
    6. 5 expect(test).to eq(result)
    7. end
    8. end
    9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
    10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
    11. 3 =======
    12. >>>>>>> d0dc1f1 (Featire specs) =======
    13. >>>>>>> 752f0c0 (Featire specs) =======
    14. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    15. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    16. >>>>>>> 7a02bbe (Featire specs) =======
    17. >>>>>>> 4552227 (Featire specs) =======
    18. 3 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:titles) { %w[Adam Zimbabwe] } ======= begin >>>>>>> d0dc1f1 (Featire specs) ======= begin >>>>>>> 752f0c0 (Featire specs) ======= begin >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= begin >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= begin >>>>>>> 08edf50 (Featire specs) ======= begin >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= begin >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:titles) { %w[Adam Zimbabwe] } >>>>>>> 5b7749a (Fix)
    19. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:books_dates) do ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> d0dc1f1 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:books_dates) do >>>>>>> 5b7749a (Fix)
    20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
    21. 1 =======
    22. >>>>>>> d0dc1f1 (Featire specs) =======
    23. >>>>>>> 752f0c0 (Featire specs) =======
    24. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    26. >>>>>>> 7a02bbe (Featire specs) =======
    27. >>>>>>> 4552227 (Featire specs) =======
    28. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> d0dc1f1 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] >>>>>>> 5b7749a (Fix)
    29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
    30. =======
    31. >>>>>>> d0dc1f1 (Featire specs) =======
    32. >>>>>>> 752f0c0 (Featire specs) =======
    33. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    34. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    35. >>>>>>> 08edf50 (Featire specs) =======
    36. >>>>>>> 7a02bbe (Featire specs) =======
    37. >>>>>>> 4552227 (Featire specs) =======
    38. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) end ======= puts e.to_s.strip >>>>>>> d0dc1f1 (Featire specs) ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) ======= puts e.to_s.strip >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= end >>>>>>> 5b7749a (Fix)
    39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
    40. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    41. exit 1
    42. end
    43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
    44. >>>>>>> 5b7749a (Fix)
    45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
    46. 1 describe 'all books sort' do
    47. 1 context 'when sort by title A to Z' do
    48. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
    49. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:books) do ======= RSpec.configure do |config| >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:books) do >>>>>>> 5b7749a (Fix)
    50. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) create(:book, title: titles.first) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> d0dc1f1 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= create(:book, title: titles.first) >>>>>>> 5b7749a (Fix)
    51. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) create(:book, title: titles.second) ======= config.use_transactional_fixtures = true >>>>>>> d0dc1f1 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= create(:book, title: titles.second) >>>>>>> 5b7749a (Fix)
    52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
    53. end
    54. 2 let(:result) { titles.second }
    55. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
    56. <<<<<<< HEAD =======
    57. >>>>>>> d0dc1f1 (Featire specs) =======
    58. >>>>>>> 752f0c0 (Featire specs) =======
    59. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    60. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    61. >>>>>>> 08edf50 (Featire specs) =======
    62. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    63. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) include_examples 'sort test' ======= config.infer_spec_type_from_file_location! >>>>>>> d0dc1f1 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= include_examples 'sort test' >>>>>>> 5b7749a (Fix)
    64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
    65. end
    66. <<<<<<< HEAD =======
    67. >>>>>>> d0dc1f1 (Featire specs) =======
    68. >>>>>>> 752f0c0 (Featire specs) =======
    69. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    70. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    71. >>>>>>> 08edf50 (Featire specs) =======
    72. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    73. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) context 'when sort title Z to A' do ======= config.filter_rails_from_backtrace! >>>>>>> d0dc1f1 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= context 'when sort title Z to A' do >>>>>>> 5b7749a (Fix)
    74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
    75. 1 let(:books) do
    76. 1 create(:book, title: titles.first)
    77. 1 create(:book, title: titles.second)
    78. end
    79. 2 let(:result) { titles.first }
    80. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
    81. 1 include_examples 'sort test'
    82. end
    83. 1 context 'when sort by price High to Low' do
    84. 1 let(:books) do
    85. 1 create(:book, price_cents: 75)
    86. 1 create(:book, price_cents: 23)
    87. end
    88. 2 let(:result) { 75 }
    89. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
    90. 1 include_examples 'sort test'
    91. end
    92. 1 context 'when sort price Low to High' do
    93. 1 let(:books) do
    94. 1 create(:book, price_cents: 75)
    95. 1 create(:book, price_cents: 23)
    96. end
    97. 2 let(:result) { 23 }
    98. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
    99. 1 include_examples 'sort test'
    100. end
    101. 1 context 'when sort by Newest' do
    102. 1 let(:books) do
    103. 1 create(:book, created_at: books_dates.first)
    104. 1 create(:book, created_at: books_dates.second)
    105. end
    106. 2 let(:result) { books_dates.first }
    107. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
    108. 1 include_examples 'sort test'
    109. end
    110. end
    111. <<<<<<< HEAD =======
    112. >>>>>>> d0dc1f1 (Featire specs) =======
    113. >>>>>>> 752f0c0 (Featire specs) =======
    114. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    115. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    116. >>>>>>> 08edf50 (Featire specs) =======
    117. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    118. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) end

    spec/support/configs/capybara.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 36.84% ======= <<<<<<< HEAD 100.0% ======= 36.84% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= 36.84% >>>>>>> bd8bda4 (Manifest_cache true) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) ======= 36.84% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 36.84% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> 5b7749a (Fix) lines covered

    19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
        
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true)
    1. 1 =======
    2. >>>>>>> d0dc1f1 (Featire specs) =======
    3. >>>>>>> 752f0c0 (Featire specs) =======
    4. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    5. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    6. >>>>>>> 7a02bbe (Featire specs) =======
    7. >>>>>>> 4552227 (Featire specs) =======
    8. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) RSpec.describe 'Author' do ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
    10. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    11. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) include_context 'with api request authentication helper methods' ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) Capybara.configure do |config| >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
    13. =======
    14. >>>>>>> bd8bda4 (Manifest_cache true) =======
    15. >>>>>>> 36356d3 (Featire specs) =======
    16. >>>>>>> 64dceec (Manifest_cache true) 1 config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> 4552227 (Featire specs)
    17. <<<<<<< HEAD <<<<<<< HEAD
    18. =======
    19. >>>>>>> bd8bda4 (Manifest_cache true) =======
    20. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request global before and after hooks'
    21. 2 let(:first_name) { FFaker::Name.first_name }
    22. 2 let(:last_name) { FFaker::Name.last_name }
    23. 2 let(:new_name) { FFaker::Name.first_name }
    24. 2 let(:old_name) { author.first_name }
    25. 4 let(:author) { create(:author) }
    26. 1 before do
    27. 4 sign_in(create(:admin_user), :admin_user)
    28. end
    29. 1 it 'can create an author' do
    30. 1 visit 'admin/authors'
    31. 1 click_link('New Author')
    32. 1 fill_in 'author[first_name]', with: first_name
    33. 1 fill_in 'author[last_name]', with: last_name
    34. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
    35. end
    36. 1 it 'can delete an author' do
    37. 1 author
    38. 1 visit 'admin/authors'
    39. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
    40. end
    41. 1 it 'can view an author' do
    42. 1 author
    43. 1 visit 'admin/authors'
    44. 1 click_link('View')
    45. 1 expect(page).to have_content(author.first_name)
    46. end
    47. 1 it 'can edit an author' do
    48. 1 author
    49. 1 visit 'admin/authors'
    50. 1 click_link('Edit')
    51. 1 fill_in 'author[first_name]', with: new_name
    52. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
    53. end
    54. end

    spec/feature/admin/book_spec.rb

    100.0% lines covered

    32 relevant lines. 32 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Book' do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. <<<<<<< HEAD ======= =======
    5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    6. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    7. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    8. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    9. >>>>>>> 4e81ea2 (Featire specs) =======
    10. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    11. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    12. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    13. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= =======
    14. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    15. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    16. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    17. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 5 <<<<<<< HEAD let(:book) { create(:book) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) let(:book) { create(:book) } ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= let(:book) { create(:book) } ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) let(:category_one) { FactoryBot.create(:category) }
    18. 3 let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    19. 1 let(:params) do
    20. <<<<<<< HEAD
    21. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    22. 1 =======
    23. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    24. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    25. 4 >>>>>>> 4e81ea2 (Featire specs) =======
    26. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    27. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    28. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    29. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    30. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    31. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    32. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) { title: FFaker::Book.title,
    33. description: FFaker::Book.description,
    34. <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    35. dimensions: FFaker::Book.cover,
    36. year_of_publication: FFaker::Number.rand(1900..2022),
    37. materials: 'Soft cover',
    38. quantity: FFaker::Number.rand(2..5) }
    39. end
    40. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    41. 1 before do
    42. 4 sign_in(create(:admin_user), :admin_user)
    43. 4 book
    44. 4 visit 'admin/books'
    45. end
    46. 1 it 'can create an category' do
    47. 1 click_link('New Book')
    48. 1 fill_in 'book[title]', with: params[:title]
    49. 1 fill_in 'book[description]', with: params[:description]
    50. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
    51. 1 fill_in 'book[price_cents]', with: params[:price_cents]
    52. 1 fill_in 'book[materials]', with: params[:materials]
    53. 1 fill_in 'book[dimensions]', with: params[:dimensions]
    54. 1 fill_in 'book[quantity]', with: params[:quantity]
    55. 1 click_button('Create Book')
    56. 1 expect(page).to have_content(params[:title])
    57. end
    58. 1 it 'can delete an book' do
    59. 1 click_link('Delete')
    60. 1 expect(page).not_to have_content(book.title)
    61. end
    62. 1 it 'can view an book' do
    63. 1 click_link('View')
    64. 1 expect(page).to have_content(book.title)
    65. end
    66. 1 it 'can edit an book' do
    67. 1 click_link('Edit')
    68. 1 fill_in 'book[title]', with: 'New title'
    69. 1 click_button('Update Book')
    70. 1 expect(page).to have_content('New title')
    71. end
    72. end

    spec/feature/admin/category_spec.rb

    100.0% lines covered

    25 relevant lines. 25 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Category' do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 2 let(:category_name) { FFaker::Book.genre }
    5. 5 let(:category) { create(:category) }
    6. 1 before do
    7. 4 sign_in(create(:admin_user), :admin_user)
    8. 4 category
    9. 4 visit 'admin/categories'
    10. <<<<<<< HEAD ======= =======
    11. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    12. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    13. 7 >>>>>>> 4e81ea2 (Featire specs) =======
    14. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    15. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
    16. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    17. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    18. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    19. 7 >>>>>>> 7a02bbe (Featire specs) =======
    20. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    21. 1 <<<<<<< HEAD it 'can create an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) ======= describe '#show book' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    22. 1 <<<<<<< HEAD click_link('New Category') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books info' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    23. <<<<<<< HEAD
    24. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    25. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) =======
    26. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    27. 1 visit "books/#{book.id}"
    28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    29. <<<<<<< HEAD
    30. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    31. =======
    32. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    33. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    34. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    35. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    36. >>>>>>> 4e81ea2 (Featire specs) =======
    37. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    38. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    39. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    40. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    41. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    42. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    43. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    44. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    45. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    46. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    47. <<<<<<< HEAD
    48. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    49. =======
    50. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    51. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    52. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    53. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    54. >>>>>>> 4e81ea2 (Featire specs) =======
    55. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD =======
    56. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    57. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    58. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    59. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    60. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    61. >>>>>>> 7a02bbe (Featire specs) =======
    62. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= =======
    63. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    64. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    65. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    66. 1 click_button('Create Category') <<<<<<< HEAD ======= ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    67. 1 <<<<<<< HEAD expect(page).to have_content(category_name) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    68. <<<<<<< HEAD
    69. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    70. =======
    71. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    72. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    73. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    74. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    75. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
    76. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    77. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    78. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    79. 1 >>>>>>> 7a02bbe (Featire specs) =======
    80. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    81. 1 <<<<<<< HEAD it 'can delete an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    82. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    83. 1 click_link('Delete')
    84. <<<<<<< HEAD ======= =======
    85. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    86. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    87. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    88. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    89. >>>>>>> 4e81ea2 (Featire specs) =======
    90. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    91. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    92. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    93. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    94. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    95. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    96. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    97. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    98. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    99. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    100. <<<<<<< HEAD
    101. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    102. =======
    103. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    104. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    105. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    106. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    107. >>>>>>> 4e81ea2 (Featire specs) =======
    108. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    109. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    110. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    111. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    112. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    113. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    114. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    115. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    116. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    117. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= expect(page).not_to have_content(category.name) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) expect(page).to have_content('Catalog')
    118. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    119. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    120. <<<<<<< HEAD
    121. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    122. =======
    123. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    124. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    125. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    126. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    127. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
    128. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    129. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    130. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    131. 1 >>>>>>> 7a02bbe (Featire specs) =======
    132. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when test read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    133. 1 <<<<<<< HEAD it 'can view an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    134. 1 <<<<<<< HEAD click_link('View') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    135. 1 <<<<<<< HEAD expect(page).to have_content(category.name) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    136. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    137. 1 <<<<<<< HEAD it 'can edit an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    138. 1 <<<<<<< HEAD click_link('Edit') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    139. 1 <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) ======= click_link 'Read More' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    140. 1 <<<<<<< HEAD click_button('Update Category') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    141. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    142. <<<<<<< HEAD
    143. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    144. 1 =======
    145. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    146. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    147. >>>>>>> 4e81ea2 (Featire specs) =======
    148. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    149. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
    150. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    151. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD expect(page).to have_content('New Genre') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    152. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    153. >>>>>>> 7a02bbe (Featire specs) =======
    154. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    155. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    156. end

    spec/feature/billing_spec.rb

    73.08% lines covered

    26 relevant lines. 19 lines covered and 7 lines missed.
        
    1. 1 RSpec.describe 'Billing', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    5. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    6. 2 let(:user) { create(:user) }
    7. 1 let(:attributes_for) { attributes_for(:billing) }
    8. 1 describe '#fill_in', js: true do
    9. 1 it 'fill in billing' do
    10. 1 sign_in(user)
    11. 1 visit edit_user_path(user.id)
    12. 1 within('div#billing.col-md-5.mb-40') do
    13. 1 find_all('div', class: 'form-group')[0] do
    14. fill_in :first_name, with: attributes_for[:first_name]
    15. end
    16. 1 find_all('div', class: 'form-group')[1] do
    17. fill_in :last_name, with: attributes_for[:last_name]
    18. end
    19. 1 find_all('div', class: 'form-group')[2] do
    20. fill_in :address, with: attributes_for[:address]
    21. end
    22. 1 find_all('div', class: 'form-group')[3] do
    23. fill_in :city, with: attributes_for[:city]
    24. end
    25. 1 find_all('div', class: 'form-group')[4] do
    26. fill_in :zip, with: attributes_for[:zip]
    27. end
    28. 1 find_all('div', class: 'form-group')[5] do
    29. fill_in :country, with: attributes_for[:country]
    30. end
    31. 1 find_all('div', class: 'form-group')[6] do
    32. fill_in :phone, with: attributes_for[:phone]
    33. end
    34. 1 click_on I18n.t('settings.save')
    35. end
    36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
    37. end
    38. end
    39. end

    spec/feature/book_spec.rb

    100.0% lines covered

    104 relevant lines. 104 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Book', type: :feature do
    2. 5 let(:category_one) { create(:category) }
    3. 3 let(:category_two) { create(:category) }
    4. 1 let(:params) do
    5. 4 { title: FFaker::Book.title,
    6. description: FFaker::Book.description,
    7. price_cents: FFaker::Number.rand(1..100),
    8. dimensions: FFaker::Book.cover,
    9. year_of_publication: FFaker::Number.rand(1900..2022),
    10. materials: 'Soft cover',
    11. quantity: FFaker::Number.rand(2..5) }
    12. end
    13. 7 let(:book) { create(:book).decorate }
    14. 1 describe '#show book' do
    15. 1 it 'show books info' do
    16. 1 visit "books/#{book.id}"
    17. 1 expect(page).to have_content(book.title)
    18. end
    19. 1 it 'clicked Beck to results' do
    20. 1 visit "books/#{book.id}"
    21. 1 find('a', class: 'general-back-link').click
    22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
    23. end
    24. 1 context 'when test read more' do
    25. 1 it 'show read more' do
    26. 1 visit "books/#{book.id}"
    27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
    28. end
    29. 1 it 'clicked read more', js: true do
    30. 1 visit "books/#{book.id}"
    31. 1 click_link 'Read More'
    32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
    33. end
    34. end
    35. <<<<<<< HEAD ======= =======
    36. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    37. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    38. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    39. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    40. >>>>>>> 4e81ea2 (Featire specs) =======
    41. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    42. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    43. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    44. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    45. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    46. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    47. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    48. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    50. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 context 'when quantity changes', js: true do
    51. <<<<<<< HEAD
    52. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    53. =======
    54. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    55. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    56. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    57. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    58. >>>>>>> 4e81ea2 (Featire specs) =======
    59. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    60. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    61. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    62. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    63. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    64. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    65. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    66. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    68. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 before do
    69. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    70. 2 visit "books/#{book.id}"
    71. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    72. 2 <<<<<<< HEAD find('a', class: 'inc').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    73. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    74. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    75. <<<<<<< HEAD
    76. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    77. 1 =======
    78. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    79. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    80. 2 >>>>>>> 4e81ea2 (Featire specs) =======
    81. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
    82. 2 >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) find('a', class: 'inc').click
    83. end
    84. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
    85. 2 ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD find('a', class: 'inc').click
    86. end
    87. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) it 'increase quantity' do >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
    88. 2 ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD find('a', class: 'inc').click
    89. end
    90. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= it 'increase quantity' do >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it 'increase quantity' do >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD it 'increase quantity' do >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD it 'increase quantity' do >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    91. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs)
    92. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
    93. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs)
    94. ======= <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) =======
    95. ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
    96. ======= >>>>>>> e3e66f3 (Featire specs)
    97. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    98. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    99. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= =======
    100. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
    101. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= =======
    102. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
    103. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
    104. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    105. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    106. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
    107. <<<<<<< HEAD ======= =======
    108. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    109. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    110. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    111. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    112. >>>>>>> 4e81ea2 (Featire specs) =======
    113. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    114. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    115. <<<<<<< HEAD
    116. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    117. =======
    118. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    119. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    120. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    121. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    122. >>>>>>> 4e81ea2 (Featire specs) =======
    123. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    124. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    125. <<<<<<< HEAD
    126. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    127. =======
    128. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    129. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    130. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    131. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    132. >>>>>>> 4e81ea2 (Featire specs) =======
    133. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    134. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) it 'decrease quantity' do >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it 'decrease quantity' do >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    135. <<<<<<< HEAD
    136. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    137. =======
    138. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    139. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    140. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    141. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    142. >>>>>>> 4e81ea2 (Featire specs) =======
    143. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    144. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 <<<<<<< HEAD find('a', class: 'dec').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= find('a', class: 'dec').click ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) expect(page).to have_content("€#{book.price * 2}")
    145. end
    146. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    147. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) it 'decrease quantity', js: true do <<<<<<< HEAD ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) it 'decrease quantity', js: true do <<<<<<< HEAD <<<<<<< HEAD ======= it 'decrease quantity', js: true do >>>>>>> 0d6dd12 (Manifest_cache true) ======= it 'decrease quantity', js: true do >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= it 'decrease quantity', js: true do >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= it 'decrease quantity', js: true do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    148. 1 find('a', class: 'dec').click
    149. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) expect(page).to have_content("€#{book.price}")
    150. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    151. end
    152. end
    153. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    154. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    155. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    156. end
    157. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    158. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    159. 1 describe '#catalog' do
    160. 1 describe 'filter by category' do
    161. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    162. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) describe '#catalog' do
    163. 1 describe 'filter by category' do
    164. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) before do
    165. <<<<<<< HEAD
    166. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    167. =======
    168. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    169. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    170. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    171. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    172. >>>>>>> 4e81ea2 (Featire specs) =======
    173. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    174. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    175. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    176. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    177. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    178. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    179. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    180. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    181. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    182. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 2 category_one.books.create(params)
    183. <<<<<<< HEAD
    184. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    185. =======
    186. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    187. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    188. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    189. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    190. >>>>>>> 4e81ea2 (Featire specs) =======
    191. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    192. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    193. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    194. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    195. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    196. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    197. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    198. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    199. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    200. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 2 visit books_path
    201. <<<<<<< HEAD
    202. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    203. =======
    204. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    205. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    206. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    207. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    208. >>>>>>> 4e81ea2 (Featire specs) =======
    209. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    210. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    211. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    212. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    213. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    214. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    215. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    216. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    217. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    218. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    219. <<<<<<< HEAD
    220. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    221. =======
    222. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    223. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    224. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    225. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    226. >>>>>>> 4e81ea2 (Featire specs) =======
    227. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    228. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    229. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    230. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    231. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    232. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    233. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    234. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    235. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    236. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    237. <<<<<<< HEAD
    238. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    239. =======
    240. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    241. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    242. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    243. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    244. >>>>>>> 4e81ea2 (Featire specs) =======
    245. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    246. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    247. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    248. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    249. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    250. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    251. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    252. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    253. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    254. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 after do
    255. <<<<<<< HEAD
    256. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    257. =======
    258. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    259. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    260. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    261. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    262. >>>>>>> 4e81ea2 (Featire specs) =======
    263. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    264. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    265. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    266. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    267. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    268. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    269. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    270. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    271. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    272. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 2 category_one.destroy
    273. <<<<<<< HEAD
    274. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    275. =======
    276. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    277. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    278. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    279. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    280. >>>>>>> 4e81ea2 (Featire specs) =======
    281. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    282. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    283. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    284. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    285. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    286. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    287. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    288. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    289. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    290. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    291. <<<<<<< HEAD
    292. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    293. =======
    294. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    295. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    296. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    297. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    298. >>>>>>> 4e81ea2 (Featire specs) =======
    299. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    300. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    301. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    302. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    303. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    304. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    305. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    306. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    307. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    308. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    309. <<<<<<< HEAD
    310. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    311. =======
    312. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    313. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    314. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    315. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    316. >>>>>>> 4e81ea2 (Featire specs) =======
    317. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    318. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    319. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    320. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    321. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    322. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    323. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    324. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    325. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    326. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 it 'show book count for category' do
    327. <<<<<<< HEAD
    328. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    329. =======
    330. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    331. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    332. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    333. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    334. >>>>>>> 4e81ea2 (Featire specs) =======
    335. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    336. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    337. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    338. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    339. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    340. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    341. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    342. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    343. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    344. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 expect(page).to have_content(category_one.books.size)
    345. <<<<<<< HEAD
    346. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    347. =======
    348. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    349. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    350. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    351. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    352. >>>>>>> 4e81ea2 (Featire specs) =======
    353. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    354. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    355. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    356. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    357. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    358. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    359. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    360. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    361. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    362. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    363. <<<<<<< HEAD
    364. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    365. =======
    366. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    367. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    368. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    369. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    370. >>>>>>> 4e81ea2 (Featire specs) =======
    371. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    372. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    373. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    374. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    375. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    376. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    377. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    378. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    379. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    380. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    381. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    382. 1 it 'filter book by category' do
    383. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
    384. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    385. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) it 'filter book by category' do
    386. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
    387. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) click_on category_one.name
    388. <<<<<<< HEAD
    389. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    390. =======
    391. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    392. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    393. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    394. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    395. >>>>>>> 4e81ea2 (Featire specs) =======
    396. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    397. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    398. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    399. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    400. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    401. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    402. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    403. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    404. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    405. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    406. <<<<<<< HEAD
    407. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    408. =======
    409. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    410. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    411. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    412. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    413. >>>>>>> 4e81ea2 (Featire specs) =======
    414. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    415. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    416. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    417. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    418. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    419. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    420. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    421. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    422. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    423. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    424. <<<<<<< HEAD
    425. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    426. =======
    427. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    428. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    429. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    430. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    431. >>>>>>> 4e81ea2 (Featire specs) =======
    432. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    433. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    434. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    435. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    436. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    437. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    438. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    439. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    440. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    441. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 expect(page).to have_content(category_one.books.first.title)
    442. <<<<<<< HEAD
    443. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    444. =======
    445. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    446. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    447. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    448. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    449. >>>>>>> 4e81ea2 (Featire specs) =======
    450. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    451. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    452. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    453. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    454. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    455. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    456. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    457. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    458. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    459. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    460. <<<<<<< HEAD
    461. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    462. =======
    463. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    464. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    465. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    466. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    467. >>>>>>> 4e81ea2 (Featire specs) =======
    468. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    469. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    470. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    471. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    472. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    473. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    474. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    475. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    476. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    477. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    478. <<<<<<< HEAD
    479. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    480. =======
    481. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    482. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    483. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    484. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    485. >>>>>>> 4e81ea2 (Featire specs) =======
    486. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    487. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    488. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    489. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    490. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    491. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    492. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    493. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    494. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    495. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    496. <<<<<<< HEAD
    497. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    498. =======
    499. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    500. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    501. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    502. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    503. >>>>>>> 4e81ea2 (Featire specs) =======
    504. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    505. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    506. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    507. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    508. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    509. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    510. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    511. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    512. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    513. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 describe 'filter by all books' do
    514. <<<<<<< HEAD
    515. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    516. =======
    517. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    518. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    519. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    520. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    521. >>>>>>> 4e81ea2 (Featire specs) =======
    522. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    523. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    524. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    525. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    526. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    527. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    528. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    529. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    530. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    531. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 before do
    532. <<<<<<< HEAD
    533. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    534. =======
    535. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    536. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    537. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    538. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    539. >>>>>>> 4e81ea2 (Featire specs) =======
    540. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    541. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    542. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    543. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    544. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    545. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    546. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    547. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    548. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    549. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 2 category_one.books.create(params)
    550. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    551. 2 category_two.books.create(params)
    552. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    553. 2 <<<<<<< HEAD visit books_path ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) visit books_path ======= category_two.books.create(params) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) ======= category_two.books.create(params) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    554. 2 <<<<<<< HEAD click_on I18n.t('catalog_page.all') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) click_on I18n.t('catalog_page.all') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    555. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    556. 2 click_on 'All'
    557. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    558. <<<<<<< HEAD
    559. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    560. =======
    561. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    562. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    563. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    564. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    565. >>>>>>> 4e81ea2 (Featire specs) =======
    566. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    567. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    568. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    569. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    570. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    571. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    572. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    573. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    574. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    575. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    576. <<<<<<< HEAD
    577. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    578. =======
    579. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    580. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    581. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    582. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    583. >>>>>>> 4e81ea2 (Featire specs) =======
    584. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    585. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    586. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    587. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    588. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    589. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    590. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    591. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    592. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    593. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 after do
    594. <<<<<<< HEAD
    595. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    596. =======
    597. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    598. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    599. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    600. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    601. >>>>>>> 4e81ea2 (Featire specs) =======
    602. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    603. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    604. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    605. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    606. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    607. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    608. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    609. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    610. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    611. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 2 category_one.destroy
    612. <<<<<<< HEAD
    613. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    614. =======
    615. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    616. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    617. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    618. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    619. >>>>>>> 4e81ea2 (Featire specs) =======
    620. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    621. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    622. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    623. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    624. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    625. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    626. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    627. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    628. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    629. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 2 category_two.destroy
    630. <<<<<<< HEAD
    631. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    632. =======
    633. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    634. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    635. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    636. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    637. >>>>>>> 4e81ea2 (Featire specs) =======
    638. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    639. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    640. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    641. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    642. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    643. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    644. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    645. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    646. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    647. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    648. <<<<<<< HEAD
    649. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    650. =======
    651. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    652. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    653. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    654. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    655. >>>>>>> 4e81ea2 (Featire specs) =======
    656. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    657. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    658. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    659. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    660. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    661. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    662. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    663. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    664. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    665. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    666. <<<<<<< HEAD
    667. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    668. =======
    669. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    670. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    671. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    672. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    673. >>>>>>> 4e81ea2 (Featire specs) =======
    674. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    675. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    676. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    677. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    678. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    679. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    680. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    681. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    682. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    683. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 it 'shown books for first category' do
    684. <<<<<<< HEAD
    685. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    686. =======
    687. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    688. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    689. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    690. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    691. >>>>>>> 4e81ea2 (Featire specs) =======
    692. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    693. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    694. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    695. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    696. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    697. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    698. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    699. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    700. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    701. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 expect(page).to have_content(category_one.books.first.title)
    702. <<<<<<< HEAD
    703. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    704. =======
    705. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    706. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    707. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    708. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    709. >>>>>>> 4e81ea2 (Featire specs) =======
    710. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    711. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    712. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    713. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    714. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    715. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    716. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    717. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    718. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    719. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    720. <<<<<<< HEAD
    721. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    722. =======
    723. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    724. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    725. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    726. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    727. >>>>>>> 4e81ea2 (Featire specs) =======
    728. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    729. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    730. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    731. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    732. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    733. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    734. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    735. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    736. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    737. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    738. <<<<<<< HEAD
    739. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    740. =======
    741. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    742. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    743. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    744. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    745. >>>>>>> 4e81ea2 (Featire specs) =======
    746. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    747. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    748. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    749. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    750. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    751. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    752. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    753. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    754. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    755. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 it 'shown books for second category' do
    756. <<<<<<< HEAD
    757. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    758. =======
    759. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    760. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    761. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    762. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    763. >>>>>>> 4e81ea2 (Featire specs) =======
    764. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    765. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    766. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    767. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    768. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    769. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    770. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    771. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    772. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    773. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 expect(page).to have_content(category_two.books.first.title)
    774. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    775. end
    776. end
    777. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    778. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    779. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    780. end
    781. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    782. <<<<<<< HEAD
    783. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    784. =======
    785. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    786. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    787. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    788. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    789. >>>>>>> 4e81ea2 (Featire specs) =======
    790. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    791. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    792. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    793. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    794. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    795. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    796. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    797. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    798. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    799. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 describe 'load_more' do
    800. <<<<<<< HEAD
    801. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    802. =======
    803. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    804. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    805. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    806. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    807. >>>>>>> 4e81ea2 (Featire specs) =======
    808. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    809. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    810. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    811. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    812. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    813. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    814. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    815. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    816. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    817. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 before do
    818. <<<<<<< HEAD
    819. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    820. =======
    821. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    822. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    823. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    824. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    825. >>>>>>> 4e81ea2 (Featire specs) =======
    826. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    827. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    828. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    829. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    830. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    831. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    832. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    833. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    834. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    835. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 3 <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= (BooksController::PAGINATION_PER_PAGE * 2).times do ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= 24.times do >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    836. <<<<<<< HEAD
    837. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    838. =======
    839. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    840. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    841. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    842. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    843. >>>>>>> 4e81ea2 (Featire specs) =======
    844. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    845. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    846. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    847. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    848. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    849. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    850. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    851. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    852. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    853. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 72 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) books << create(:book)
    854. end
    855. end <<<<<<< HEAD ======= ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    856. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    857. <<<<<<< HEAD
    858. 4 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    859. 4 =======
    860. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    861. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    862. >>>>>>> 4e81ea2 (Featire specs) =======
    863. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    864. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
    865. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    866. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD let(:books) { [] } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    867. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    868. >>>>>>> 7a02bbe (Featire specs) =======
    869. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    870. <<<<<<< HEAD
    871. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    872. 1 =======
    873. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    874. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    875. 4 >>>>>>> 4e81ea2 (Featire specs) =======
    876. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    877. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
    878. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    879. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD it 'show books without view more button' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    880. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    881. 4 >>>>>>> 7a02bbe (Featire specs) =======
    882. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) ======= let(:books) { [] } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    883. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    884. 1 visit books_path
    885. <<<<<<< HEAD ======= =======
    886. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    887. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    888. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    889. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    890. >>>>>>> 4e81ea2 (Featire specs) =======
    891. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    892. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    893. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    894. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    895. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    896. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    897. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    898. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    899. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    900. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    901. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    902. 1 it 'show books without view more button' do
    903. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    904. 1 <<<<<<< HEAD find('a', id: 'view_more', class: 'view_more').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    905. 1 <<<<<<< HEAD expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    906. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    907. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
    908. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    909. <<<<<<< HEAD
    910. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    911. =======
    912. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    913. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    914. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    915. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    916. >>>>>>> 4e81ea2 (Featire specs) =======
    917. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    918. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    919. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    920. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    921. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    922. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    923. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    924. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    925. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    926. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    927. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    928. 1 context 'when view more' do
    929. 1 it 'show books with view more button' do
    930. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    931. 1 <<<<<<< HEAD visit books_path ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) visit books_path ======= context 'when view more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when view more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    932. <<<<<<< HEAD
    933. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    934. =======
    935. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    936. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    937. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    938. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    939. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
    940. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    941. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    942. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    943. 1 >>>>>>> 7a02bbe (Featire specs) =======
    944. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    945. 1 <<<<<<< HEAD expect(page).to have_css('a', class: 'view_more') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    946. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    947. 1 expect(page).to have_css('a', class: 'view_more')
    948. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    949. <<<<<<< HEAD
    950. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    951. =======
    952. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    953. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    954. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    955. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    956. >>>>>>> 4e81ea2 (Featire specs) =======
    957. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    958. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    959. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    960. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    961. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    962. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    963. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    964. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    965. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    966. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    967. <<<<<<< HEAD
    968. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    969. =======
    970. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    971. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    972. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    973. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    974. >>>>>>> 4e81ea2 (Featire specs) =======
    975. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    976. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    977. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    978. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    979. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    980. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    981. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    982. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    983. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    984. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 it 'show loaded books', js: true do
    985. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    986. 1 visit books_path
    987. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    988. 1 <<<<<<< HEAD find('a', class: 'view_more').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) find('a', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    989. 1 <<<<<<< HEAD expect(page).to have_content(books.last.title) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) expect(page).to have_content(books.last.title) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    990. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    991. <<<<<<< HEAD
    992. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    993. =======
    994. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    995. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    996. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    997. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    998. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
    999. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    1000. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1001. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    1002. 1 >>>>>>> 7a02bbe (Featire specs) =======
    1003. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1004. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1005. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) end
    1006. end
    1007. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1008. <<<<<<< HEAD
    1009. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1010. =======
    1011. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    1012. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    1013. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    1014. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    1015. >>>>>>> 4e81ea2 (Featire specs) =======
    1016. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1017. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    1018. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    1019. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    1020. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    1021. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    1022. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    1023. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    1024. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    1025. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 describe 'sort' do
    1026. <<<<<<< HEAD
    1027. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1028. =======
    1029. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    1030. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    1031. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    1032. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    1033. >>>>>>> 4e81ea2 (Featire specs) =======
    1034. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1035. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    1036. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    1037. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    1038. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    1039. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    1040. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    1041. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    1042. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    1043. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 shared_examples 'sort test' do
    1044. <<<<<<< HEAD
    1045. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1046. =======
    1047. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    1048. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    1049. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    1050. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    1051. >>>>>>> 4e81ea2 (Featire specs) =======
    1052. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1053. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    1054. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    1055. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    1056. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    1057. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    1058. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    1059. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    1060. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    1061. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 5 it 'sort books' do
    1062. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1063. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
    1064. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
    1065. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1066. 5 <<<<<<< HEAD create(:book, title: 'Anna', price_cents: 23, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) create(:book, title: 'Anna', price_cents: 23, ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1067. <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1068. <<<<<<< HEAD
    1069. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1070. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) =======
    1071. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1072. 5 FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
    1073. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1074. <<<<<<< HEAD
    1075. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1076. =======
    1077. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    1078. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    1079. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    1080. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    1081. >>>>>>> 4e81ea2 (Featire specs) =======
    1082. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1083. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    1084. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    1085. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    1086. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    1087. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    1088. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    1089. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    1090. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    1091. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 5 visit books_path
    1092. <<<<<<< HEAD
    1093. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1094. =======
    1095. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    1096. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    1097. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    1098. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    1099. >>>>>>> 4e81ea2 (Featire specs) =======
    1100. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1101. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    1102. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    1103. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    1104. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    1105. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    1106. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    1107. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    1108. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    1109. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1110. <<<<<<< HEAD
    1111. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1112. =======
    1113. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    1114. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
    1115. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    1116. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    1117. >>>>>>> 4e81ea2 (Featire specs) =======
    1118. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1119. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    1120. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    1121. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    1122. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
    1123. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    1124. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    1125. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    1126. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    1127. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 5 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
    1128. id: 'menu').click <<<<<<< HEAD ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1129. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
    1130. 5 click_link button
    1131. end
    1132. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
    1133. end
    1134. end
    1135. 1 context 'when sort by title A to Z' do
    1136. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= let(:button) { 'Title: A to Z' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1137. 2 let(:book_title) { 'Anna' }
    1138. 1 include_examples 'sort test'
    1139. end
    1140. 1 context 'when sort by title Z to A' do
    1141. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= let(:button) { 'Title: Z to A' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1142. 2 let(:book_title) { 'Zimbabwe' }
    1143. 1 include_examples 'sort test'
    1144. end
    1145. 1 context 'when sort by price High to Low' do
    1146. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= let(:button) { 'Price: High to Low' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1147. 2 let(:book_title) { 'Zimbabwe' }
    1148. 1 include_examples 'sort test'
    1149. end
    1150. 1 context 'when sort by price Low to High' do
    1151. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= let(:button) { 'Price: Low to High' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1152. 2 let(:book_title) { 'Anna' }
    1153. 1 include_examples 'sort test'
    1154. end
    1155. 1 context 'when sort by newest' do
    1156. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= let(:button) { 'Newest first' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1157. 2 let(:book_title) { 'Zimbabwe' }
    1158. 1 include_examples 'sort test'
    1159. end
    1160. end
    1161. end

    spec/feature/home_spec.rb

    100.0% lines covered

    <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 49 relevant lines. 49 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Home', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 1 describe 'Get Started' do
    5. 1 it 'on click move to catalog page' do
    6. 1 visit root_path
    7. 1 click_on 'Get Started'
    8. 1 expect(page).to have_content('Catalog')
    9. end
    10. end
    11. 1 describe 'navbar' do
    12. 2 let(:books_category) { create(:books_category) }
    13. 1 it 'on click home move to root-path' do
    14. 1 visit books_path
    15. 1 find('a', id: 'root').click
    16. 1 expect(page).to have_content('Get Started')
    17. end
    18. 1 it 'on click category name move to root-path with books that belong to this category' do
    19. 1 books_category
    20. 1 visit root_path
    21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
    22. 1 within('ul', id: 'nav') do
    23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
    24. end
    25. 1 expect(page).to have_content(books_category.category.books.first.title)
    26. end
    27. 1 context 'when guest' do
    28. 1 it 'on click login go to login page' do
    29. 1 visit root_path
    30. 1 within 'div', class: 'visible-xs' do
    31. 1 click_link I18n.t('header.log_in')
    32. end
    33. 1 expect(page).to have_content(I18n.t('header.log_in'))
    34. end
    35. 1 it 'on click sing up go to sing up page' do
    36. 1 visit root_path
    37. 1 within 'div', class: 'visible-xs' do
    38. 1 click_link I18n.t('header.sing_up')
    39. end
    40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
    41. end
    42. end
    43. 1 context 'when user', js: true do
    44. 4 let(:user) { create(:user) }
    45. 1 before do
    46. 3 sign_in(user)
    47. end
    48. 1 it 'on click account show settings' do
    49. 1 visit root_path
    50. 1 click_on I18n.t('header.account')
    51. 1 expect(page).to have_content(I18n.t('header.settings'))
    52. end
    53. 1 it 'on click account show log_out' do
    54. 1 visit root_path
    55. 1 click_on I18n.t('header.account')
    56. 1 expect(page).to have_content(I18n.t('header.log_out'))
    57. end
    58. 1 it 'log_out' do
    59. 1 visit root_path
    60. 1 click_on I18n.t('header.account')
    61. 1 click_on(I18n.t('header.log_out'), match: :first)
    62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
    63. end
    64. end
    65. end
    66. end

    spec/feature/login_spec.rb

    100.0% lines covered

    19 relevant lines. 19 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Login', type: :feature do
    2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
    3. 1 describe '#login' do
    4. 1 before do
    5. 2 visit new_user_session_path
    6. end
    7. 1 context 'when successfully login' do
    8. 1 it 'login' do
    9. 1 within 'form', class: 'new_user', id: 'new_user' do
    10. 1 fill_in 'user_email', with: user_second.email
    11. 1 fill_in 'user_password', with: user_second.password
    12. 1 click_on I18n.t('header.log_in')
    13. end
    14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
    15. end
    16. end
    17. 1 context 'when unsuccessfully login' do
    18. 1 it 'didn`t login' do
    19. 1 within 'form', class: 'new_user', id: 'new_user' do
    20. 1 fill_in 'user_email', with: user_second.email
    21. 1 fill_in 'user_password', with: 'wrong_password'
    22. 1 click_on I18n.t('header.log_in')
    23. end
    24. 1 expect(page).to have_text 'Invalid Email or password.'
    25. end
    26. end
    27. end
    28. end

    spec/feature/new_password_spec.rb

    100.0% lines covered

    13 relevant lines. 13 lines covered and 0 lines missed.
        
    1. 1 require_relative '../rails_helper'
    2. 1 require_relative '../support/shared_context'
    3. 1 RSpec.describe 'New Password', type: :feature do
    4. 3 let(:user) { FactoryBot.create(:user) }
    5. 1 describe '#new_password' do
    6. 1 it 'change password' do
    7. 1 user.reset_password('newPassword', 'newPassword')
    8. 1 expect(user.password).to eq('newPassword')
    9. end
    10. 1 it 'not validate password' do
    11. 1 visit new_user_password_path
    12. 1 fill_in 'email', with: user.email
    13. 1 click_on I18n.t('login.send_instructions')
    14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
    15. end
    16. end
    17. end

    spec/feature/registration_spec.rb

    100.0% lines covered

    29 relevant lines. 29 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Registration', type: :feature do
    2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
    3. 1 describe '#sing_up' do
    4. 1 before do
    5. 3 visit new_user_registration_path
    6. end
    7. 1 context 'when successfully sing_up' do
    8. 1 it 'sing_up users' do
    9. 1 within 'form', class: 'new_user', id: 'new_user' do
    10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
    11. 1 fill_in 'user_password', with: user.password
    12. 1 fill_in 'user_password_confirmation', with: user.password
    13. 1 click_on I18n.t('header.sing_up')
    14. end
    15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
    16. end
    17. end
    18. 1 context 'when users is already exits' do
    19. 1 it 'sing_up users' do
    20. 1 within 'form', class: 'new_user', id: 'new_user' do
    21. 1 fill_in 'user_email', with: user.email
    22. 1 fill_in 'user_password', with: user.password
    23. 1 fill_in 'user_password_confirmation', with: user.password
    24. 1 click_on I18n.t('header.sing_up')
    25. end
    26. 1 expect(page).to have_text('Email has already been taken')
    27. end
    28. end
    29. 1 context 'when unsuccessfully sing_up' do
    30. 1 it 'didn`t sing_up' do
    31. 1 within 'form', class: 'new_user', id: 'new_user' do
    32. 1 fill_in 'user_email', with: FFaker::Internet.email
    33. 1 fill_in 'user_password', with: 'password'
    34. 1 fill_in 'user_password_confirmation', with: 'wrong'
    35. 1 click_on I18n.t('header.sing_up')
    36. end
    37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
    38. end
    39. end
    40. end
    41. end

    spec/feature/review_spec.rb

    100.0% lines covered

    30 relevant lines. 30 lines covered and 0 lines missed.
        
    1. 1 require_relative '../rails_helper'
    2. 1 require_relative '../support/shared_context'
    3. 1 RSpec.describe 'Review', type: :feature do
    4. 1 include_context 'with api request authentication helper methods'
    5. 1 include_context 'with api request global before and after hooks'
    6. 3 let(:user) { FactoryBot.create(:user).decorate }
    7. 3 let(:book) { FactoryBot.create(:book).decorate }
    8. 1 before do
    9. 2 sign_in(user)
    10. 2 visit book_path(book)
    11. end
    12. 1 shared_examples 'review' do
    13. 2 it 'review' do
    14. 2 find('i', id: rating).click
    15. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
    16. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
    17. 2 click_on I18n.t('review.post')
    18. 2 expect(page).to have_content(result)
    19. end
    20. end
    21. 1 describe '#post review', js: true do
    22. 1 context 'when review posted' do
    23. 2 let(:rating) { "star#{rand(1..5)}" }
    24. 2 let(:title_words) { 5 }
    25. 2 let(:body_words) { 10 }
    26. 2 let(:result) { user.name_or_email }
    27. 1 include_examples 'review'
    28. end
    29. 1 context 'when review not been posted' do
    30. 2 let(:rating) { "star#{rand(1..5)}" }
    31. 2 let(:title_words) { 80 }
    32. 2 let(:body_words) { 30 }
    33. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
    34. 1 include_examples 'review'
    35. end
    36. end
    37. end

    spec/feature/settings_spec.rb

    100.0% lines covered

    34 relevant lines. 34 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'Settings', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 4 let(:user) { create(:user) }
    5. 1 before do
    6. 3 sign_in(user)
    7. 3 visit edit_user_path(user.id)
    8. 3 click_link I18n.t('settings.privacy')
    9. end
    10. 1 describe '#email_change' do
    11. 1 it 'change email' do
    12. 1 within('div', id: 'email') do
    13. 1 fill_in :email, with: FFaker::Internet.email
    14. 1 click_on I18n.t('settings.save')
    15. end
    16. 1 user.confirm
    17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
    18. end
    19. end
    20. 1 describe '#password_change' do
    21. 1 context 'when error' do
    22. 1 it 'didnt change password' do
    23. 1 within('div', id: 'password') do
    24. 1 fill_in :current_password, with: user.password
    25. 1 fill_in :password, with: 'newPassword'
    26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
    27. 1 click_on I18n.t('settings.save')
    28. end
    29. 1 user.confirm
    30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
    31. end
    32. end
    33. 1 context 'when successful' do
    34. 1 it 'didnt change password' do
    35. 1 within('div', id: 'password') do
    36. 1 fill_in :current_password, with: user.password
    37. 1 fill_in :password, with: 'newPassword'
    38. 1 fill_in :password_confirmation, with: 'newPassword'
    39. 1 click_on I18n.t('settings.save')
    40. end
    41. 1 user.confirm
    42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
    43. end
    44. end
    45. end
    46. end

    spec/feature/shipping_spec.rb

    73.08% lines covered

    26 relevant lines. 19 lines covered and 7 lines missed.
        
    1. 1 RSpec.describe 'Shipping', type: :feature do
    2. 1 include_context 'with api request authentication helper methods'
    3. 1 include_context 'with api request global before and after hooks'
    4. 2 let(:user) { FactoryBot.create(:user) }
    5. 1 let(:attributes_for) { attributes_for(:shipping) }
    6. 1 describe '#fill_in', js: true do
    7. 1 it 'fill in shipping' do
    8. 1 sign_in(user)
    9. 1 visit edit_user_path(user.id)
    10. 1 within('div#shipping.col-md-5.mb-40') do
    11. 1 find_all('div', class: 'form-group')[0] do
    12. fill_in :first_name, with: attributes_for[:first_name]
    13. end
    14. 1 find_all('div', class: 'form-group')[1] do
    15. fill_in :last_name, with: attributes_for[:last_name]
    16. end
    17. 1 find_all('div', class: 'form-group')[2] do
    18. fill_in :address, with: attributes_for[:address]
    19. end
    20. 1 find_all('div', class: 'form-group')[3] do
    21. fill_in :city, with: attributes_for[:city]
    22. end
    23. 1 find_all('div', class: 'form-group')[4] do
    24. fill_in :zip, with: attributes_for[:zip]
    25. end
    26. 1 find_all('div', class: 'form-group')[5] do
    27. fill_in :country, with: attributes_for[:country]
    28. end
    29. 1 find_all('div', class: 'form-group')[6] do
    30. fill_in :phone, with: attributes_for[:phone]
    31. end
    32. 1 click_on I18n.t('settings.save')
    33. end
    34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
    35. end
    36. end
    37. end

    spec/feature/user_spec.rb

    100.0% lines covered

    42 relevant lines. 42 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe 'User', type: :feature do
    2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
    3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
    4. 1 describe '#sing_up' do
    5. 1 context 'when successfully sing_up' do
    6. 1 before do
    7. 1 visit new_user_registration_path
    8. 1 within 'form', class: 'new_user', id: 'new_user' do
    9. 1 fill_in 'user_email', with: user.email
    10. 1 fill_in 'user_password', with: user.password
    11. 1 fill_in 'user_password_confirmation', with: user.password
    12. 1 click_on I18n.t('header.sing_up')
    13. end
    14. end
    15. 1 it 'sing_up user' do
    16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
    17. end
    18. end
    19. 1 context 'when unsuccessfully sing_up' do
    20. 1 it 'didn`t sing_up' do
    21. 1 visit new_user_registration_path
    22. 1 within 'form', class: 'new_user', id: 'new_user' do
    23. 1 fill_in 'user_email', with: FFaker::Internet.email
    24. 1 fill_in 'user_password', with: 'wrong'
    25. 1 fill_in 'user_password_confirmation', with: 'wrong'
    26. 1 click_on I18n.t('header.sing_up')
    27. end
    28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
    29. end
    30. end
    31. end
    32. 1 describe '#login' do
    33. 1 before do
    34. 2 user_second.confirm
    35. end
    36. 1 context 'when successfully login' do
    37. 1 it 'login' do
    38. 1 visit new_user_session_path
    39. 1 within 'form', class: 'new_user', id: 'new_user' do
    40. 1 fill_in 'user_email', with: user_second.email
    41. 1 fill_in 'user_password', with: user_second.password
    42. 1 click_on I18n.t('header.log_in')
    43. end
    44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
    45. end
    46. end
    47. 1 context 'when unsuccessfully login' do
    48. 1 it 'didn`t login' do
    49. 1 visit new_user_session_path
    50. 1 within 'form', class: 'new_user', id: 'new_user' do
    51. 1 fill_in 'user_email', with: user_second.email
    52. 1 fill_in 'user_password', with: 'wrong_password'
    53. 1 click_on I18n.t('header.log_in')
    54. end
    55. 1 expect(page).to have_text 'Invalid Email or password.'
    56. end
    57. end
    58. end
    59. end

    spec/models/admin_user_spec.rb

    100.0% lines covered

    5 relevant lines. 5 lines covered and <<<<<<< HEAD ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 <<<<<<< HEAD RSpec.describe AdminUser, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) RSpec.describe AdminUser, type: :model do ======= RSpec.describe 'Homes', type: :feature do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) RSpec.describe 'Homes', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    3. 1 <<<<<<< HEAD context 'when validations' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) context 'when validations' do ======= describe 'Get Started' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) describe 'Get Started' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= describe 'Get Started' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    4. <<<<<<< HEAD
    5. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    6. 2 =======
    7. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    8. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    9. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    10. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    11. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
    12. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    13. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
    14. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    15. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD it { is_expected.to validate_presence_of(:email) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
    16. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    17. 1 >>>>>>> 7a02bbe (Featire specs) =======
    18. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to validate_presence_of(:email) } ======= it 'on click move to catalog page' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it 'on click move to catalog page' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    19. <<<<<<< HEAD
    20. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    21. 2 =======
    22. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    23. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    24. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    25. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    26. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
    27. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    28. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
    29. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    30. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD it { is_expected.to validate_presence_of(:password) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
    31. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    32. 1 >>>>>>> 7a02bbe (Featire specs) =======
    33. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to validate_presence_of(:password) } ======= visit root_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= visit root_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) visit root_path >>>>>>> 4e81ea2 (Featire specs) ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit root_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= visit root_path <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    34. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    35. 1 click_on 'Get Started'
    36. 1 expect(page).to have_content('Catalog')
    37. end
    38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    39. <<<<<<< HEAD
    40. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    41. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) =======
    42. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
    43. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    44. 1 describe 'navbar' do
    45. 2 let(:books_category) { FactoryBot.create(:books_category) }
    46. 1 it 'on click home move to root-path' do
    47. 1 visit books_path
    48. 1 find('a', id: 'root').click
    49. 1 expect(page).to have_content('Get Started')
    50. end
    51. 1 it 'on click category name move to root-path with books that belong to this category' do
    52. 1 books_category
    53. 1 visit root_path
    54. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
    55. 1 within('ul', id: 'nav') do
    56. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
    57. end
    58. 1 expect(page).to have_content(books_category.category.books.first.title)
    59. end
    60. end
    61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end

    spec/models/author_spec.rb

    100.0% lines covered

    <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD RSpec.describe Author, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) RSpec.describe Author, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= require 'rails_helper' <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    2. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    3. 1 describe 'author' do
    4. 1 context 'when validations' do
    5. 2 it { is_expected.to validate_presence_of(:first_name) }
    6. 2 it { is_expected.to validate_presence_of(:last_name) }
    7. end
    8. <<<<<<< HEAD ======= =======
    9. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    10. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    11. >>>>>>> 4e81ea2 (Featire specs) =======
    12. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    13. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    14. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    15. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    16. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    17. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    18. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    19. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    20. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    21. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    22. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    23. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    24. <<<<<<< HEAD
    25. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    26. =======
    27. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    28. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    29. >>>>>>> 4e81ea2 (Featire specs) =======
    30. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    31. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    32. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    33. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    34. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    35. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    36. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    38. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    40. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    41. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 <<<<<<< HEAD context 'when associations' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) context 'when associations' do ======= RSpec.describe Author, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) RSpec.describe Author, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    42. <<<<<<< HEAD
    43. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    44. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) =======
    45. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
    46. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    47. 1 describe 'author' do
    48. 1 context 'when validations' do
    49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 2 <<<<<<< HEAD it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    50. <<<<<<< HEAD
    51. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    52. =======
    53. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    54. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    55. >>>>>>> 4e81ea2 (Featire specs) =======
    56. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    57. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    58. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    59. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    60. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    61. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    62. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    63. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    64. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    65. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    66. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    67. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 2 <<<<<<< HEAD it { is_expected.to have_many(:books).through(:authors_books) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to have_many(:books).through(:authors_books) } ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    68. <<<<<<< HEAD
    69. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    70. =======
    71. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    72. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    73. >>>>>>> 4e81ea2 (Featire specs) =======
    74. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    75. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    76. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    77. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    78. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    79. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    80. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    81. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    82. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    83. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    84. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    85. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    86. <<<<<<< HEAD
    87. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    88. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) =======
    89. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
    90. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    91. 1 context 'when associations' do
    92. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
    93. 2 it { is_expected.to have_many(:books).through(:authors_books) }
    94. end
    95. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    96. <<<<<<< HEAD
    97. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    98. =======
    99. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    100. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    101. >>>>>>> 4e81ea2 (Featire specs) =======
    102. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    103. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    104. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    105. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    106. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    107. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    108. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    109. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    110. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    111. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    112. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    113. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end

    spec/models/authors_book_spec.rb

    100.0% lines covered

    <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) require 'rails_helper'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) RSpec.describe AuthorsBook, type: :model do
    3. <<<<<<< HEAD
    4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    5. =======
    6. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    7. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    8. >>>>>>> 4e81ea2 (Featire specs) =======
    9. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    10. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    11. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    12. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    13. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    14. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    15. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    16. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    17. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    18. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    19. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    20. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 describe 'authors_book' do
    21. <<<<<<< HEAD
    22. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    23. =======
    24. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    25. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    26. >>>>>>> 4e81ea2 (Featire specs) =======
    27. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    28. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    29. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    30. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    31. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    32. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    33. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    34. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    35. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    36. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    38. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 context 'when validations' do
    39. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    40. 2 it { is_expected.to validate_presence_of(:book) }
    41. 2 it { is_expected.to validate_presence_of(:author) }
    42. end
    43. 1 context 'when associations' do
    44. 2 it { is_expected.to belong_to(:author) }
    45. 2 it { is_expected.to belong_to(:book) }
    46. end
    47. end
    48. end

    spec/models/billing_spec.rb

    100.0% lines covered

    20 relevant lines. 20 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Billing, type: :model do
    2. 1 describe 'billing' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
    5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
    6. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    7. 2 <<<<<<< HEAD it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    8. 2 <<<<<<< HEAD it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to validate_presence_of(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    9. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    10. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
    11. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
    12. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
    13. <<<<<<< HEAD ======= =======
    14. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    15. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    16. >>>>>>> 4e81ea2 (Featire specs) =======
    17. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    19. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    20. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    21. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    22. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    23. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    24. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    25. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    26. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    27. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    28. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    29. <<<<<<< HEAD
    30. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    31. =======
    32. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    33. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    34. >>>>>>> 4e81ea2 (Featire specs) =======
    35. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    36. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    38. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    39. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    40. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    41. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    42. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    43. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    44. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    45. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    46. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    47. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    48. 1 context 'when not validations' do
    49. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
    50. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
    51. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
    52. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
    53. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
    54. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
    55. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
    56. end
    57. <<<<<<< HEAD ======= =======
    58. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    59. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    60. >>>>>>> 4e81ea2 (Featire specs) =======
    61. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    62. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    63. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    64. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    65. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    66. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    67. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    68. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    69. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    70. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    71. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    72. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 context 'when associations' do
    73. <<<<<<< HEAD
    74. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    75. =======
    76. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    77. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    78. >>>>>>> 4e81ea2 (Featire specs) =======
    79. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    81. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    82. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    83. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    84. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    85. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    86. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    87. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    88. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    89. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    90. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 2 <<<<<<< HEAD it { is_expected.to belong_to(:user) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to belong_to(:user) } ======= it { is_expected.to belong_to(:author) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to belong_to(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    91. <<<<<<< HEAD
    92. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    93. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) =======
    94. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
    95. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    96. 2 it { is_expected.to belong_to(:book) }
    97. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    98. <<<<<<< HEAD
    99. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    100. =======
    101. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    102. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    103. >>>>>>> 4e81ea2 (Featire specs) =======
    104. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    105. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    106. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    107. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    108. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    109. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    110. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    111. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    112. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    113. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    114. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    115. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    116. <<<<<<< HEAD
    117. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    118. =======
    119. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    120. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    121. >>>>>>> 4e81ea2 (Featire specs) =======
    122. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    123. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    124. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    125. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    126. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    127. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    128. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    129. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    130. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    131. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    132. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    133. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end

    spec/models/book_spec.rb

    100.0% lines covered

    16 relevant lines. 16 lines covered and 0 lines missed.
        
    1. 1 <<<<<<< HEAD RSpec.describe Book, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) RSpec.describe Book, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= require 'rails_helper' <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    2. <<<<<<< HEAD
    3. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    4. 1 =======
    5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    6. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    7. >>>>>>> 4e81ea2 (Featire specs) =======
    8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
    10. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
    12. >>>>>>> 4e81ea2 (Featire specs) =======
    13. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD describe 'books' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
    14. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    15. >>>>>>> 7a02bbe (Featire specs) =======
    16. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) describe 'books' do ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    17. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) RSpec.describe Book, type: :model do
    18. 1 describe 'books' do
    19. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) context 'when validations' do
    20. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    21. 2 it { is_expected.to validate_presence_of(:title) }
    22. 2 it { is_expected.to validate_presence_of(:description) }
    23. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    24. 2 <<<<<<< HEAD it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to validate_presence_of(:title) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    25. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:year_of_publication) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to validate_presence_of(:year_of_publication) } ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to validate_presence_of(:description) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    26. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:quantity) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to validate_presence_of(:quantity) } ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to validate_presence_of(:price) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    27. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:materials) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to validate_presence_of(:materials) } ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    28. 2 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to validate_presence_of(:quantity) }
    29. 2 it { is_expected.to validate_presence_of(:materials) }
    30. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to validate_presence_of(:dimensions) }
    31. <<<<<<< HEAD
    32. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    33. =======
    34. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    35. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    36. >>>>>>> 4e81ea2 (Featire specs) =======
    37. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    38. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    39. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    40. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    41. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    42. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    43. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    44. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    45. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    46. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    47. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    48. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    49. <<<<<<< HEAD
    50. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    51. =======
    52. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    53. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    54. >>>>>>> 4e81ea2 (Featire specs) =======
    55. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    56. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    57. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    58. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    59. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    60. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    61. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    62. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    63. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    64. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    65. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    66. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    67. <<<<<<< HEAD
    68. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    69. =======
    70. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    71. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    72. >>>>>>> 4e81ea2 (Featire specs) =======
    73. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    74. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    75. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    76. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    77. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    78. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    79. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    81. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    82. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    83. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    84. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 context 'when associations' do
    85. <<<<<<< HEAD
    86. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    87. =======
    88. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    89. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    90. >>>>>>> 4e81ea2 (Featire specs) =======
    91. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    92. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    93. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    94. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    95. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    96. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    97. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    98. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    99. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    100. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    101. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    102. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
    103. <<<<<<< HEAD
    104. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    105. =======
    106. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    107. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    108. >>>>>>> 4e81ea2 (Featire specs) =======
    109. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    110. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    111. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    112. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    113. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    114. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    115. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    116. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    117. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    118. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    119. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    120. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 2 it { is_expected.to have_many(:authors).through(:authors_books) }
    121. <<<<<<< HEAD
    122. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    123. =======
    124. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    125. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    126. >>>>>>> 4e81ea2 (Featire specs) =======
    127. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    128. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    129. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    130. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    131. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    132. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    133. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    134. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    135. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    136. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    137. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    138. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    139. <<<<<<< HEAD
    140. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    141. =======
    142. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    143. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    144. >>>>>>> 4e81ea2 (Featire specs) =======
    145. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    146. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    147. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    148. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    149. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    150. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    151. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    152. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    153. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    154. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    155. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    156. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
    157. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    158. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
    159. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    160. 2 <<<<<<< HEAD it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    161. end
    162. end
    163. end

    spec/models/books_category_spec.rb

    100.0% lines covered

    <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe BooksCategory, type: :model do
    2. 1 describe 'books_categories' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:book) }
    5. 2 it { is_expected.to validate_presence_of(:category) }
    6. end
    7. 1 context 'when associations' do
    8. 2 it { is_expected.to belong_to(:category) }
    9. 2 it { is_expected.to belong_to(:book) }
    10. end
    11. end
    12. end

    spec/models/category_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Category, type: :model do
    2. 1 describe 'category' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to validate_presence_of(:name) }
    5. end
    6. 1 context 'when associations' do
    7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
    8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
    9. end
    10. end
    11. end

    spec/models/review_spec.rb

    100.0% lines covered

    14 relevant lines. 14 lines covered and <<<<<<< HEAD ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 <<<<<<< HEAD RSpec.describe Review, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) RSpec.describe Review, type: :model do ======= RSpec.describe BooksCategory, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) RSpec.describe BooksCategory, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    3. 1 <<<<<<< HEAD describe 'review' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) describe 'review' do ======= describe 'books_categories' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) describe 'books_categories' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= describe 'books_categories' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    4. 1 context 'when validations' do
    5. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:title) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to validate_presence_of(:title) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    6. 2 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to validate_presence_of(:body) }
    7. 2 it { is_expected.to validate_presence_of(:rating) }
    8. 2 it { is_expected.to validate_presence_of(:verified) }
    9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
    10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
    11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
    12. end
    13. 1 context 'when associations' do
    14. 2 it { is_expected.to belong_to(:book) }
    15. 2 it { is_expected.to belong_to(:user) }
    16. end
    17. end
    18. end

    spec/models/shipping_spec.rb

    100.0% lines covered

    20 relevant lines. 20 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe Shipping, type: :model do
    2. 1 describe 'shipping' do
    3. 1 context 'when validations' do
    4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
    5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
    6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
    7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
    8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
    9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
    10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
    11. end
    12. 1 context 'when not validations' do
    13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
    14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
    15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
    16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
    17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
    18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
    19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
    20. end
    21. 1 context 'when associations' do
    22. 2 it { is_expected.to belong_to(:user) }
    23. end
    24. end
    25. end

    spec/models/user_spec.rb

    100.0% lines covered

    9 relevant lines. 9 lines covered and 0 lines missed.
        
    1. 1 RSpec.describe User, type: :model do
    2. 1 let(:user) { FactoryBot.create(:user) }
    3. 1 describe 'author' do
    4. 1 context 'when validations' do
    5. 2 it { is_expected.to validate_presence_of(:email) }
    6. 2 it { is_expected.to validate_presence_of(:password) } <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to validate_presence_of(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    7. end
    8. 1 <<<<<<< HEAD context 'with associations' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) context 'with associations' do ======= context 'when associations' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) context 'when associations' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= context 'when associations' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    9. 2 <<<<<<< HEAD it { is_expected.to have_one(:billing) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to have_one(:billing) } ======= it { is_expected.to belong_to(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to belong_to(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    10. 2 <<<<<<< HEAD it { is_expected.to have_one(:shipping) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) it { is_expected.to have_one(:shipping) } ======= it { is_expected.to belong_to(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to belong_to(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    11. end
    12. end
    13. end
    <<<<<<< HEAD

    spec/queryes/book_query_spec.rb

    ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)

    spec/queryes/book_query_spec.rb

    =======

    spec/models/category_spec.rb

    >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======

    spec/models/category_spec.rb

    >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======

    spec/models/category_spec.rb

    >>>>>>> 4e81ea2 (Featire specs) =======

    spec/models/category_spec.rb

    >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======

    spec/models/category_spec.rb

    >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======

    spec/models/category_spec.rb

    >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======

    spec/models/category_spec.rb

    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======

    spec/models/category_spec.rb

    >>>>>>> 4e81ea2 (Featire specs) =======

    spec/models/category_spec.rb

    >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======

    spec/models/category_spec.rb

    >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======

    spec/models/category_spec.rb

    >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======

    spec/models/category_spec.rb

    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD 45 relevant lines. 45 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 45 relevant lines. 45 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 <<<<<<< HEAD RSpec.describe BookQuery do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) RSpec.describe BookQuery do ======= RSpec.describe Category, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) RSpec.describe Category, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    3. 1 <<<<<<< HEAD shared_examples 'sort test' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) shared_examples 'sort test' do ======= describe 'category' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) describe 'category' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= describe 'category' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    4. <<<<<<< HEAD
    5. 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    6. 5 =======
    7. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    8. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    9. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    10. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    11. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
    12. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    13. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
    14. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    15. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD it 'sort' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
    16. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    17. 1 >>>>>>> 7a02bbe (Featire specs) =======
    18. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) it 'sort' do ======= context 'when validations' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) context 'when validations' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= context 'when validations' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    19. <<<<<<< HEAD
    20. 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    21. 5 =======
    22. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    23. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    24. 2 >>>>>>> 4e81ea2 (Featire specs) =======
    25. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    26. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
    27. 2 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    28. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
    29. 2 >>>>>>> 4e81ea2 (Featire specs) =======
    30. 2 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD books ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
    31. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    32. 2 >>>>>>> 7a02bbe (Featire specs) =======
    33. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) books ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it { is_expected.to validate_presence_of(:name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    34. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    35. 5 expect(test).to eq(result)
    36. <<<<<<< HEAD ======= =======
    37. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    38. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    39. >>>>>>> 4e81ea2 (Featire specs) =======
    40. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    41. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    42. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    43. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    44. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    45. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    46. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    47. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    48. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
    49. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    50. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    51. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    52. <<<<<<< HEAD
    53. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    54. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) =======
    55. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
    56. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    57. 1 context 'when associations' do
    58. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
    59. 2 it { is_expected.to have_many(:books).through(:books_categories) }
    60. end
    61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    62. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    63. end
    <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)

    spec/models/user_spec.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe User, type: :model do
    3. 1 pending "add some examples to (or delete) #{__FILE__}"
    4. end
    <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)

    spec/rails_helper.rb

    87.5% lines covered

    16 relevant lines. 14 lines covered and 2 lines missed.
        
    1. 1 require 'spec_helper'
    2. 1 ENV['RAILS_ENV'] ||= 'test'
    3. 1 require_relative '../config/environment'
    4. 1 abort('The Rails environment is running in production mode!') if Rails.env.production?
    5. 1 require 'rspec/rails'
    6. 1 require 'shoulda-matchers'
    7. 1 require_relative 'support/configs/shoulda_matcher'
    8. 1 require_relative 'support/configs/capybara'
    9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> c033601 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    10. <<<<<<< HEAD <<<<<<< HEAD
    11. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    12. 3 =======
    13. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    14. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    15. >>>>>>> 4e81ea2 (Featire specs) =======
    16. <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    17. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
    18. >>>>>>> 4e81ea2 (Featire specs) =======
    19. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
    20. >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    21. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
    22. 3 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) let(:titles) { %w[Adam Zimbabwe] } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) let(:titles) { %w[Adam Zimbabwe] } ======= begin >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= begin >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) begin >>>>>>> 4e81ea2 (Featire specs) ======= begin >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= begin >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= begin >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= begin <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= begin >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= begin >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= let(:titles) { %w[Adam Zimbabwe] } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= begin >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    23. 1 <<<<<<< HEAD <<<<<<< HEAD let(:books_dates) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) let(:books_dates) do ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4e81ea2 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= let(:books_dates) do >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    24. <<<<<<< HEAD <<<<<<< HEAD
    25. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    26. 1 =======
    27. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    28. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    29. >>>>>>> 4e81ea2 (Featire specs) =======
    30. <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    31. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 9d98d9ab (Featire specs) =======
    32. >>>>>>> 4e81ea2 (Featire specs) =======
    33. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
    34. >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    35. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
    36. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4e81ea2 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    37. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    38. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    39. =======
    40. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    41. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    42. >>>>>>> 4e81ea2 (Featire specs) =======
    43. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
    44. >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    45. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    46. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= =======
    47. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    48. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    49. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    50. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
    51. >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) end ======= puts e.to_s.strip >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) puts e.to_s.strip >>>>>>> 4e81ea2 (Featire specs) ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= puts e.to_s.strip <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= end >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    52. <<<<<<< HEAD <<<<<<< HEAD
    53. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    54. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) =======
    55. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
    56. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    57. exit 1
    58. end
    59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
    60. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    61. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    62. 1 describe 'all books sort' do
    63. 1 context 'when sort by title A to Z' do
    64. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    65. 1 <<<<<<< HEAD <<<<<<< HEAD let(:books) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) let(:books) do ======= RSpec.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) RSpec.configure do |config| >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= let(:books) do >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    66. 1 <<<<<<< HEAD <<<<<<< HEAD create(:book, title: titles.first) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) create(:book, title: titles.first) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4e81ea2 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= create(:book, title: titles.first) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    67. 1 <<<<<<< HEAD <<<<<<< HEAD create(:book, title: titles.second) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) create(:book, title: titles.second) ======= config.use_transactional_fixtures = true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.use_transactional_fixtures = true >>>>>>> 4e81ea2 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= create(:book, title: titles.second) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    68. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    69. end
    70. 2 let(:result) { titles.second }
    71. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
    72. <<<<<<< HEAD <<<<<<< HEAD ======= =======
    73. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    74. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    75. >>>>>>> 4e81ea2 (Featire specs) =======
    76. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    77. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    78. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    79. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    80. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    81. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    82. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD include_examples 'sort test' ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) include_examples 'sort test' ======= config.infer_spec_type_from_file_location! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.infer_spec_type_from_file_location! >>>>>>> 4e81ea2 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= include_examples 'sort test' >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    83. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    84. end
    85. <<<<<<< HEAD <<<<<<< HEAD ======= =======
    86. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    87. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    88. >>>>>>> 4e81ea2 (Featire specs) =======
    89. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    90. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    91. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    92. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    93. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    94. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    95. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD context 'when sort title Z to A' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) context 'when sort title Z to A' do ======= config.filter_rails_from_backtrace! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.filter_rails_from_backtrace! >>>>>>> 4e81ea2 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= context 'when sort title Z to A' do >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    96. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    97. 1 let(:books) do
    98. 1 create(:book, title: titles.first)
    99. 1 create(:book, title: titles.second)
    100. end
    101. 2 let(:result) { titles.first }
    102. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
    103. 1 include_examples 'sort test'
    104. end
    105. 1 context 'when sort by price High to Low' do
    106. 1 let(:books) do
    107. 1 create(:book, price_cents: 75)
    108. 1 create(:book, price_cents: 23)
    109. end
    110. 2 let(:result) { 75 }
    111. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
    112. 1 include_examples 'sort test'
    113. end
    114. 1 context 'when sort price Low to High' do
    115. 1 let(:books) do
    116. 1 create(:book, price_cents: 75)
    117. 1 create(:book, price_cents: 23)
    118. end
    119. 2 let(:result) { 23 }
    120. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
    121. 1 include_examples 'sort test'
    122. end
    123. 1 context 'when sort by Newest' do
    124. 1 let(:books) do
    125. 1 create(:book, created_at: books_dates.first)
    126. 1 create(:book, created_at: books_dates.second)
    127. end
    128. 2 let(:result) { books_dates.first }
    129. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
    130. 1 include_examples 'sort test'
    131. end
    132. end
    133. <<<<<<< HEAD <<<<<<< HEAD ======= =======
    134. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    135. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    136. >>>>>>> 4e81ea2 (Featire specs) =======
    137. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    138. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    139. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    140. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    141. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    142. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    143. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs)

    spec/support/configs/capybara.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 100.0% ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 84003439 (Featire specs) 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 36.84% ======= <<<<<<< HEAD 100.0% ======= 36.84% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 36.84% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= 36.84% >>>>>>> bd8bda4 (Manifest_cache true) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 36.84% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) 100.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= 36.84% >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= ======= 36.84% >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 36.84% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= 100.0% >>>>>>> c7a726c5 (Rebased) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) lines covered

    19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 84003439 (Featire specs) 19 lines covered and 0 lines missed. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= 7 lines covered and 12 lines missed. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 7 lines covered and 12 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> c7a726c5 (Rebased) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
        
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    2. 1 =======
    3. >>>>>>> 752f0c0 (Featire specs) =======
    4. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
    5. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    6. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) =======
    7. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    8. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    9. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
    10. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 37e48018 (Featire specs) Capybara.configure do |config| >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) Capybara.configure do |config| <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) =======
    11. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
    12. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) =======
    13. 1 >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 84003439 (Featire specs) Capybara.configure do |config| <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= Capybara.configure do |config| <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD Capybara.configure do |config| >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) Capybara.configure do |config| ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs)
    14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) =======
    15. >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    16. 1 =======
    17. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    18. >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d8dd3b4a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs)
    19. =======
    20. >>>>>>> aa7b40c (Manifest_cache true) 1 ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs)
    21. =======
    22. >>>>>>> aa7b40c (Manifest_cache true) 1 ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    23. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD =======
    24. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) config.asset_host = 'http://localhost:3000' <<<<<<< HEAD ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 9d98d9ab (Featire specs) config.asset_host = 'http://localhost:3000' <<<<<<< HEAD ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) ======= ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    26. =======
    27. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======
    28. >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) =======
    29. ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
    30. >>>>>>> 9d98d9ab (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> ebcdce06 (Featire specs)
    31. >>>>>>> b3f2049 (Featire specs)
    32. >>>>>>> 009401d (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs)
    33. =======
    34. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) config.server_port = 3001 >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs)
    35. <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
    36. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs)
    37. >>>>>>> 86d584a (Manifest_cache true)
    38. <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD =======
    39. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) config.default_max_wait_time = 5 ======= <<<<<<< HEAD ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs)
    40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    41. =======
    42. =======
    43. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
    44. =======
    45. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
    46. ======= >>>>>>> 5c33a07 (Featire specs)
    47. =======
    48. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
    49. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
    50. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= config.default_max_wait_time = 5 ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 904663c (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    51. <<<<<<< HEAD
    52. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) =======
    53. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
    54. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) =======
    55. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= =======
    56. 1 >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD end >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs)
    57. =======
    58. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= config.asset_host = 'http://localhost:3000' >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs)
    59. <<<<<<< HEAD ======= <<<<<<< HEAD =======
    60. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= >>>>>>> 490b01d6 (Manifest_cache true) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) =======
    61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    62. =======
    63. =======
    64. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
    65. =======
    66. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
    67. =======
    68. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
    69. =======
    70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    71. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    72. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    73. =======
    74. =======
    75. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
    76. =======
    77. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
    78. ======= >>>>>>> 5c33a07 (Featire specs)
    79. =======
    80. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
    81. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 490b01d6 (Manifest_cache true)
    82. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= config.default_max_wait_time = 5 ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) end ======= >>>>>>> 84809242 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    83. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD
    84. =======
    85. ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    86. =======
    87. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
    88. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
    89. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
    90. <<<<<<< HEAD <<<<<<< HEAD
    91. =======
    92. =======
    93. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 84809242 (Featire specs) config.default_max_wait_time = 5 <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    94. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 6e923b9d (Featire specs)
    95. =======
    96. =======
    97. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
    98. ======= >>>>>>> 5c33a07 (Featire specs)
    99. =======
    100. =======
    101. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
    102. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) =======
    103. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 6e923b9d (Featire specs) ======= =======
    104. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    105. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= config.server_port = 3001 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs)
    106. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
    107. ======= =======
    108. =======
    109. >>>>>>> c8cdb08 (Manifest_cache true) =======
    110. >>>>>>> 4a0e3b6 (Manifest_cache true) =======
    111. >>>>>>> 24b58e6 (Manifest_cache true) =======
    112. >>>>>>> 00f8b58 (Manifest_cache true) 1 config.default_max_wait_time = 5 >>>>>>> 11792758 (Rebased)
    113. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
    114. >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    115. =======
    116. ======= >>>>>>> 5c33a07 (Featire specs)
    117. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
    118. <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) =======
    119. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> 11792758 (Rebased)
    120. <<<<<<< HEAD =======
    121. 1 <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 <<<<<<< HEAD
    122. >>>>>>> 34509eee (Featire specs)
    123. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 6e923b9d (Featire specs)
    124. 1 ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
    125. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    126. =======
    127. =======
    128. >>>>>>> 490b01d6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
    129. <<<<<<< HEAD
    130. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
    131. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD
    132. =======
    133. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
    134. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= =======
    135. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
    136. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= <<<<<<< HEAD
    137. <<<<<<< HEAD ======= =======
    138. =======
    139. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
    140. ======= >>>>>>> 5c33a07 (Featire specs)
    141. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
    142. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
    143. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs)
    144. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    145. =======
    146. ======= >>>>>>> 5c33a07 (Featire specs)
    147. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
    148. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
    149. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
    150. <<<<<<< HEAD <<<<<<< HEAD
    151. =======
    152. =======
    153. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs)
    154. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs)
    155. =======
    156. 1 >>>>>>> d0dc1f1 (Featire specs) =======
    157. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test
    158. <<<<<<< HEAD >>>>>>> c033601 (Rebased)
    159. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
    160. ======= =======
    161. 1 config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs)
    162. <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs)
    163. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
    164. =======
    165. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
    166. =======
    167. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
    168. ======= >>>>>>> 5c33a07 (Featire specs)
    169. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
    170. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
    171. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs)
    172. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    173. =======
    174. ======= >>>>>>> 5c33a07 (Featire specs)
    175. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
    176. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
    177. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
    178. <<<<<<< HEAD <<<<<<< HEAD
    179. =======
    180. =======
    181. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs)
    182. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs)
    183. =======
    184. 1 >>>>>>> d0dc1f1 (Featire specs) =======
    185. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= =======
    186. =======
    187. =======
    188. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= =======
    189. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD ======= ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased)
    190. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
    191. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
    192. ======= ======= >>>>>>> 563720e (Featire specs) =======
    193. 1 <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c7a726c5 (Rebased)
    194. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased)
    195. >>>>>>> 86d584a (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs)
    196. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs) =======
    197. =======
    198. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) =======
    199. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
    200. ======= >>>>>>> 5c33a07 (Featire specs)
    201. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
    202. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
    203. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) end ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4552227 (Featire specs) ======= config.server_port = 3001 >>>>>>> c7a726c5 (Rebased)
    204. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    205. =======
    206. >>>>>>> e9f3851 (Manifest_cache true) =======
    207. <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
    208. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)
    209. =======
    210. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    211. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= config.server_port = 3001 >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    212. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    213. =======
    214. >>>>>>> e9f3851 (Manifest_cache true) =======
    215. >>>>>>> d782a28 (Manifest_cache true) =======
    216. >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)
    217. =======
    218. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    219. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
    220. >>>>>>> c59d1a99 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
    221. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
    222. =======
    223. <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true)
    224. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
    225. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= 1 >>>>>>> d0dc1f1 (Featire specs) =======
    226. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs)
    227. >>>>>>> c033601 (Rebased)
    228. >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c7a726c5 (Rebased)
    229. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    230. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
    231. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD
    232. =======
    233. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
    234. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= =======
    235. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) =======
    236. =======
    237. >>>>>>> c7a726c5 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c7a726c5 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    238. <<<<<<< HEAD <<<<<<< HEAD
    239. ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
    240. =======
    241. =======
    242. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
    243. ======= >>>>>>> 5c33a07 (Featire specs)
    244. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
    245. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    246. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    247. =======
    248. ======= >>>>>>> 5c33a07 (Featire specs)
    249. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
    250. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    251. <<<<<<< HEAD
    252. =======
    253. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
    254. >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end
    255. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs)
    256. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs)
    257. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    258. =======
    259. >>>>>>> 752f0c0 (Featire specs) =======
    260. >>>>>>> bd8bda4 (Manifest_cache true) =======
    261. >>>>>>> 4e81ea2 (Featire specs) =======
    262. >>>>>>> aa7b40c (Manifest_cache true) =======
    263. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD 1 <<<<<<< HEAD ======= =======
    264. <<<<<<< HEAD =======
    265. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
    266. <<<<<<< HEAD =======
    267. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> c05ee511 (Featire specs) Capybara.register_driver :headless_chrome do |app| <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) config.default_driver = :rack_test ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= end >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= config.default_driver = :rack_test >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true)
    268. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    269. =======
    270. >>>>>>> e9f3851 (Manifest_cache true) =======
    271. ======= ======= >>>>>>> 36356d3 (Featire specs)
    272. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) =======
    273. >>>>>>> e3e66f3 (Featire specs) ======= =======
    274. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true) =======
    275. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs)
    276. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD
    277. =======
    278. =======
    279. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
    280. =======
    281. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
    282. =======
    283. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
    284. =======
    285. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    286. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    287. =======
    288. =======
    289. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
    290. =======
    291. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
    292. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    293. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs)
    294. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs)
    295. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD
    296. =======
    297. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
    298. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
    299. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
    300. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= =======
    301. =======
    302. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
    303. =======
    304. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
    305. ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    306. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
    307. =======
    308. >>>>>>> fd6db03 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= =======
    309. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= config.javascript_driver = :headless_chrome >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    310. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs)
    311. =======
    312. =======
    313. >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    314. >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs)
    315. >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
    316. <<<<<<< HEAD <<<<<<< HEAD
    317. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> c59d1a99 (Manifest_cache true)
    318. 1 <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> c59d1a99 (Manifest_cache true)
    319. <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    320. =======
    321. =======
    322. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
    323. =======
    324. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
    325. ======= >>>>>>> 5c33a07 (Featire specs)
    326. ======= >>>>>>> c59d1a99 (Manifest_cache true)
    327. >>>>>>> 8cbdfeb (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= config.default_driver = :rack_test ======= <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs)
    328. 1 <<<<<<< HEAD ======= >>>>>>> 64dceec (Manifest_cache true) config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs)
    329. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs)
    330. =======
    331. =======
    332. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
    333. =======
    334. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
    335. =======
    336. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
    337. =======
    338. =======
    339. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
    340. 1 >>>>>>> 08edf50 (Featire specs) =======
    341. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs)
    342. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
    343. ======= =======
    344. =======
    345. >>>>>>> c8cdb08 (Manifest_cache true) =======
    346. >>>>>>> 4a0e3b6 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs)
    347. 1 <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs)
    348. 1 <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
    349. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
    350. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
    351. =======
    352. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
    353. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
    354. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= =======
    355. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    356. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
    357. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
    358. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs)
    359. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    360. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    361. =======
    362. >>>>>>> 752f0c0 (Featire specs) =======
    363. >>>>>>> bd8bda4 (Manifest_cache true) =======
    364. >>>>>>> 4e81ea2 (Featire specs) =======
    365. >>>>>>> aa7b40c (Manifest_cache true) =======
    366. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
    367. >>>>>>> c033601 (Rebased) 1 =======
    368. <<<<<<< HEAD =======
    369. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
    370. <<<<<<< HEAD =======
    371. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) config.default_driver = :rack_test ======= <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 96aecde (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= config.default_driver = :rack_test >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= end >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    372. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
    373. =======
    374. ======= ======= >>>>>>> 84003439 (Featire specs)
    375. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
    376. =======
    377. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    378. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    379. >>>>>>> 37e48018 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> e3e66f3 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    380. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    381. ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD
    382. >>>>>>> 84809242 (Featire specs) 1 config.javascript_driver = :headless_chrome <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= config.javascript_driver = :headless_chrome >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased)
    383. <<<<<<< HEAD
    384. 1 ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    385. ======= <<<<<<< HEAD
    386. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs)
    387. =======
    388. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    389. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) =======
    390. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
    391. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= end
    392. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 34509eee (Featire specs)
    393. >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
    394. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD
    395. >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> bf554f4 (Rebased)
    396. >>>>>>> 11792758 (Rebased) end
    397. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased)
    398. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    399. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    400. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    401. >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= end
    402. ======= >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> e5752db (Featire specs)
    403. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= =======
    404. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs)
    405. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    406. =======
    407. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
    408. ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs)
    409. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true)
    410. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
    411. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    412. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    413. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    414. ======= =======
    415. 1 config.default_driver = :rack_test
    416. >>>>>>> b15044a (Manifest_cache true)
    417. >>>>>>> 96aecde (Manifest_cache true) =======
    418. >>>>>>> 2c640cf (Manifest_cache true) 1 config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs)
    419. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true)
    420. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased)
    421. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true)
    422. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= =======
    423. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    424. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    425. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
    426. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
    427. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    428. =======
    429. >>>>>>> 752f0c0 (Featire specs) =======
    430. >>>>>>> bd8bda4 (Manifest_cache true) =======
    431. >>>>>>> 4e81ea2 (Featire specs) =======
    432. >>>>>>> aa7b40c (Manifest_cache true) =======
    433. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true)
    434. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    435. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    436. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    437. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 11792758 (Rebased) 1 ======= <<<<<<< HEAD
    438. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    439. 1 >>>>>>> 752f0c0 (Featire specs) =======
    440. >>>>>>> bd8bda4 (Manifest_cache true) =======
    441. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    442. >>>>>>> aa7b40c (Manifest_cache true) =======
    443. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    444. >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased) =======
    445. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    446. =======
    447. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
    448. =======
    449. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) >>>>>>> 11792758 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 11792758 (Rebased) Capybara.register_driver :headless_chrome do |app| ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    450. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
    451. 1 ======= <<<<<<< HEAD <<<<<<< HEAD
    452. >>>>>>> ae2a012 (Manifest_cache true) =======
    453. 1 >>>>>>> 752f0c0 (Featire specs) =======
    454. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    455. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    456. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    457. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
    458. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD
    459. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
    460. ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
    461. >>>>>>> 11792758 (Rebased) >>>>>>> 75fa7e1b (Rebased) =======
    462. 1 >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
    463. 1 >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    464. <<<<<<< HEAD ======= <<<<<<< HEAD
    465. =======
    466. >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs)
    467. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) 1 =======
    468. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    469. 1 >>>>>>> 752f0c0 (Featire specs) =======
    470. >>>>>>> bd8bda4 (Manifest_cache true) =======
    471. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    472. >>>>>>> aa7b40c (Manifest_cache true) =======
    473. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    474. >>>>>>> 183b6c5 (Manifest_cache true) =======
    475. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
    476. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) Capybara.register_driver :headless_chrome do |app|
    477. 1 <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD client = Selenium::WebDriver::Remote::Http::Default.new ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= Capybara.register_driver :headless_chrome do |app|
    478. <<<<<<< HEAD
    479. 1 =======
    480. >>>>>>> ae2a012 (Manifest_cache true) =======
    481. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) client = Selenium::WebDriver::Remote::Http::Default.new ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs)
    482. <<<<<<< HEAD <<<<<<< HEAD
    483. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    484. ======= <<<<<<< HEAD
    485. 1 =======
    486. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    487. 1 >>>>>>> 752f0c0 (Featire specs) =======
    488. >>>>>>> bd8bda4 (Manifest_cache true) =======
    489. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    490. >>>>>>> aa7b40c (Manifest_cache true) =======
    491. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true) client = Selenium::WebDriver::Remote::Http::Default.new <<<<<<< HEAD ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) client = Selenium::WebDriver::Remote::Http::Default.new ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> af057e3 (Featire specs) ======= ======= end >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
    492. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    493. =======
    494. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
    495. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= =======
    496. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
    497. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
    498. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    499. >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5b7749a (Fix)
    500. end
    501. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    502. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    503. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    504. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    505. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
    506. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
    507. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true)
    508. ======= ======= >>>>>>> 183b6c5 (Manifest_cache true)
    509. =======
    510. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    511. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    512. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    513. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
    514. >>>>>>> 5b7749a (Fix) =======
    515. >>>>>>> ebcdce06 (Featire specs) 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD
    516. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    517. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD
    518. ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
    519. >>>>>>> 84003439 (Featire specs) 1 =======
    520. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 84003439 (Featire specs) ======= =======
    521. 1 >>>>>>> 752f0c0 (Featire specs) =======
    522. >>>>>>> bd8bda4 (Manifest_cache true) =======
    523. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    524. >>>>>>> aa7b40c (Manifest_cache true) =======
    525. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    526. ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
    527. <<<<<<< HEAD ======= ======= =======
    528. =======
    529. =======
    530. >>>>>>> e9f3851 (Manifest_cache true) 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 5b7749a (Fix) Capybara.register_driver :headless_chrome do |app| >>>>>>> e3e66f3 (Featire specs)
    531. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs)
    532. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) =======
    533. >>>>>>> 307f31f (Manifest_cache true) ======= ======= =======
    534. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) 1 =======
    535. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    536. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
    537. 1 <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) =======
    538. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD ======= =======
    539. 1 >>>>>>> 752f0c0 (Featire specs) =======
    540. >>>>>>> bd8bda4 (Manifest_cache true) =======
    541. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    542. >>>>>>> aa7b40c (Manifest_cache true) =======
    543. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) Capybara.register_driver :headless_chrome do |app|
    544. <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs)
    545. 1 <<<<<<< HEAD =======
    546. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
    547. 1 >>>>>>> e3e66f3 (Featire specs) =======
    548. >>>>>>> ae2a012 (Manifest_cache true) =======
    549. 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    550. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    551. 1 >>>>>>> 08edf50 (Featire specs) =======
    552. 1 <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    553. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) =======
    554. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= =======
    555. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    556. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD =======
    557. >>>>>>> fd6db03 (Manifest_cache true) =======
    558. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD
    559. >>>>>>> 49e8a6c (Rebased) =======
    560. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    561. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    562. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
    563. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    564. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
    565. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    566. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) client = Selenium::WebDriver::Remote::Http::Default.new ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= Capybara.register_driver :headless_chrome do |app| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 0d6dd12 (Manifest_cache true) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    567. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    568. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    569. ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    570. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
    571. 1 =======
    572. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    573. 1 >>>>>>> 752f0c0 (Featire specs) =======
    574. >>>>>>> bd8bda4 (Manifest_cache true) =======
    575. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    576. >>>>>>> aa7b40c (Manifest_cache true) =======
    577. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    578. >>>>>>> 183b6c5 (Manifest_cache true) =======
    579. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
    580. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    581. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 9d98d9ab (Featire specs)
    582. =======
    583. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
    584. 1 =======
    585. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    586. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
    587. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
    588. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    589. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
    590. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
    591. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
    592. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
    593. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
    594. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
    595. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
    596. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
    597. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
    598. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    599. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
    600. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    601. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    602. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    603. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    604. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
    605. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    606. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    607. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    608. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    609. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    610. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    611. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
    612. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    613. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    614. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
    615. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    616. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) client.read_timeout = 150 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= client.read_timeout = 150 ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= client.read_timeout = 150 ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) client.read_timeout = 150 ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4e81ea2 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= client.read_timeout = 150 >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 0d6dd12 (Manifest_cache true) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= client.read_timeout = 150 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= client.read_timeout = 150 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    617. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs)
    618. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    619. ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    620. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
    621. 1 =======
    622. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    623. 1 >>>>>>> 752f0c0 (Featire specs) =======
    624. >>>>>>> bd8bda4 (Manifest_cache true) =======
    625. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    626. >>>>>>> aa7b40c (Manifest_cache true) =======
    627. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    628. >>>>>>> 183b6c5 (Manifest_cache true) =======
    629. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
    630. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    631. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    632. =======
    633. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
    634. 1 =======
    635. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    636. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
    637. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
    638. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    639. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
    640. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
    641. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
    642. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
    643. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 11792758 (Rebased) ======= =======
    644. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
    645. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
    646. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    647. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
    648. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    649. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    650. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    651. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    652. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    653. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    654. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    655. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    656. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    657. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    658. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
    659. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    660. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= client.read_timeout = 150 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    661. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    662. ======= <<<<<<< HEAD
    663. 1 =======
    664. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    665. 1 >>>>>>> 752f0c0 (Featire specs) =======
    666. >>>>>>> bd8bda4 (Manifest_cache true) =======
    667. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    668. >>>>>>> aa7b40c (Manifest_cache true) =======
    669. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    670. >>>>>>> 183b6c5 (Manifest_cache true) =======
    671. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    672. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
    673. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
    674. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======
    675. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    676. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    677. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true)
    678. =======
    679. 1 >>>>>>> 08edf50 (Featire specs) =======
    680. >>>>>>> 183b6c5 (Manifest_cache true) =======
    681. 1 >>>>>>> 7a02bbe (Featire specs) =======
    682. >>>>>>> fd6db03 (Manifest_cache true) =======
    683. 1 >>>>>>> 4552227 (Featire specs) =======
    684. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
    685. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    686. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
    687. ======= <<<<<<< HEAD
    688. 1 =======
    689. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    690. 1 >>>>>>> 752f0c0 (Featire specs) =======
    691. >>>>>>> bd8bda4 (Manifest_cache true) =======
    692. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    693. >>>>>>> aa7b40c (Manifest_cache true) =======
    694. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= =======
    695. >>>>>>> 183b6c5 (Manifest_cache true) =======
    696. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
    697. 1 >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) =======
    698. 1 >>>>>>> 70fcacc (Featire specs) =======
    699. >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= =======
    700. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= =======
    701. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= =======
    702. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= =======
    703. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    704. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 11792758 (Rebased) =======
    705. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 31d15e66 (Fix) =======
    706. 1 >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) =======
    707. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
    708. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= =======
    709. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
    710. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    711. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs)
    712. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
    713. <<<<<<< HEAD
    714. =======
    715. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    716. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) =======
    717. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    718. >>>>>>> 183b6c5 (Manifest_cache true) =======
    719. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= options = ::Selenium::WebDriver::Chrome::Options.new
    720. 1 <<<<<<< HEAD ======= =======
    721. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    722. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= options = ::Selenium::WebDriver::Chrome::Options.new
    723. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) options.headless! >>>>>>> 84003439 (Featire specs)
    724. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true)
    725. =======
    726. 1 >>>>>>> 08edf50 (Featire specs) =======
    727. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= =======
    728. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
    729. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    730. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD
    731. 1 <<<<<<< HEAD ======= ======= <<<<<<< HEAD
    732. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
    733. 1 >>>>>>> e3e66f3 (Featire specs) =======
    734. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    735. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    736. >>>>>>> bd8bda4 (Manifest_cache true) =======
    737. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) =======
    738. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
    739. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
    740. >>>>>>> 49e8a6c (Rebased) =======
    741. 1 >>>>>>> 872e675 (Fix) =======
    742. >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    743. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    744. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
    745. 1 >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
    746. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    747. 1 <<<<<<< HEAD <<<<<<< HEAD =======
    748. 1 <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
    749. =======
    750. 1 <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
    751. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    752. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    753. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
    754. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) =======
    755. >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true)
    756. ======= <<<<<<< HEAD
    757. 1 =======
    758. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= =======
    759. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
    760. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
    761. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
    762. <<<<<<< HEAD
    763. =======
    764. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    765. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
    766. 1 >>>>>>> 08edf50 (Featire specs) =======
    767. >>>>>>> 183b6c5 (Manifest_cache true) =======
    768. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
    769. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    770. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    771. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
    772. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) options.headless!
    773. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    774. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    775. =======
    776. >>>>>>> 752f0c0 (Featire specs) =======
    777. >>>>>>> bd8bda4 (Manifest_cache true) =======
    778. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ebcdce06 (Featire specs)
    779. >>>>>>> aa7b40c (Manifest_cache true) =======
    780. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    781. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    782. =======
    783. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    784. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
    785. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= =======
    786. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
    787. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
    788. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    789. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    790. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
    791. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
    792. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
    793. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    794. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= =======
    795. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    796. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    797. =======
    798. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    799. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    800. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    801. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    802. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
    803. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= =======
    804. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    805. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
    806. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    807. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    808. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    809. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    810. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    811. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs)
    812. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    813. 1 =======
    814. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    815. 1 >>>>>>> 752f0c0 (Featire specs) =======
    816. >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    817. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    818. >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    819. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    820. >>>>>>> 183b6c5 (Manifest_cache true) =======
    821. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
    822. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
    823. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    824. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    825. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    826. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> e59c273d (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
    827. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    828. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    829. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    830. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) =======
    831. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    832. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    833. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    834. <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
    835. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    836. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    837. 1 >>>>>>> c7a726c5 (Rebased) =======
    838. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= =======
    839. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= =======
    840. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    841. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
    842. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
    843. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
    844. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= =======
    845. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) options.add_argument('--no-sandbox')
    846. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    847. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    848. =======
    849. ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true)
    850. 1 =======
    851. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    852. 1 >>>>>>> 752f0c0 (Featire specs) =======
    853. >>>>>>> bd8bda4 (Manifest_cache true) =======
    854. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    855. >>>>>>> aa7b40c (Manifest_cache true) =======
    856. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> 304cd28a (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
    857. 1 =======
    858. <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    859. 1 >>>>>>> 752f0c0 (Featire specs) =======
    860. >>>>>>> bd8bda4 (Manifest_cache true) =======
    861. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    862. >>>>>>> aa7b40c (Manifest_cache true) =======
    863. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    864. >>>>>>> 183b6c5 (Manifest_cache true) =======
    865. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
    866. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs)
    867. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
    868. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    869. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
    870. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
    871. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
    872. ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
    873. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
    874. <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
    875. 1 <<<<<<< HEAD >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= =======
    876. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) ======= =======
    877. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD options.add_argument('--disable-dev-shm-usage') >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    878. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    879. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    880. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    881. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
    882. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    883. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    884. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    885. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    886. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    887. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
    888. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    889. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    890. 1 >>>>>>> c7a726c5 (Rebased) ======= options.add_argument('--disable-dev-shm-usage') ======= ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) options.add_argument('--disable-dev-shm-usage') ======= <<<<<<< HEAD options.add_argument('--disable-dev-shm-usage') ======= options.add_argument('--no-sandbox') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    891. <<<<<<< HEAD <<<<<<< HEAD
    892. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    893. ======= <<<<<<< HEAD <<<<<<< HEAD
    894. 1 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) =======
    895. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    896. 1 >>>>>>> 752f0c0 (Featire specs) =======
    897. >>>>>>> bd8bda4 (Manifest_cache true) =======
    898. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    899. >>>>>>> aa7b40c (Manifest_cache true) =======
    900. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) options.add_argument('--disable-dev-shm-usage') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--disable-dev-shm-usage') ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) options.add_argument('--disable-dev-shm-usage') ======= options.add_argument('--no-sandbox') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--no-sandbox') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    901. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    902. 1 ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    903. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    904. 1 ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) =======
    905. 1 ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    906. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    907. 1 >>>>>>> 752f0c0 (Featire specs) =======
    908. >>>>>>> bd8bda4 (Manifest_cache true) =======
    909. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    910. >>>>>>> aa7b40c (Manifest_cache true) =======
    911. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    912. >>>>>>> 183b6c5 (Manifest_cache true) =======
    913. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
    914. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    915. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs)
    916. >>>>>>> 02a399d (Manifest_cache true) =======
    917. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) =======
    918. =======
    919. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    920. ======= <<<<<<< HEAD
    921. 1 =======
    922. >>>>>>> ebcdce06 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    923. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
    924. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
    925. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    926. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
    927. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
    928. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
    929. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
    930. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
    931. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
    932. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
    933. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
    934. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
    935. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    936. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
    937. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    938. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    939. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    940. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    941. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
    942. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    943. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    944. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    945. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    946. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    947. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    948. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
    949. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    950. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    951. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= =======
    952. 1 >>>>>>> 752f0c0 (Featire specs) =======
    953. >>>>>>> bd8bda4 (Manifest_cache true) =======
    954. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    955. >>>>>>> aa7b40c (Manifest_cache true) =======
    956. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
    957. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    958. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) options.add_argument('--window-size=1400,1400') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--window-size=1400,1400') ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--window-size=1400,1400') ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) options.add_argument('--window-size=1400,1400') ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    959. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs)
    960. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    961. ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    962. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
    963. 1 =======
    964. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    965. 1 >>>>>>> 752f0c0 (Featire specs) =======
    966. >>>>>>> bd8bda4 (Manifest_cache true) =======
    967. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    968. >>>>>>> aa7b40c (Manifest_cache true) =======
    969. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    970. >>>>>>> 183b6c5 (Manifest_cache true) =======
    971. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
    972. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    973. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    974. =======
    975. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
    976. 1 =======
    977. =======
    978. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    979. ======= <<<<<<< HEAD
    980. 1 =======
    981. >>>>>>> ebcdce06 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    982. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
    983. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
    984. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    985. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
    986. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
    987. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
    988. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
    989. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
    990. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
    991. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
    992. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
    993. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
    994. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    995. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
    996. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    997. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    998. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    999. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    1000. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
    1001. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    1002. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1003. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1004. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1005. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    1006. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    1007. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
    1008. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    1009. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    1010. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= =======
    1011. 1 >>>>>>> 752f0c0 (Featire specs) =======
    1012. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1013. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    1014. >>>>>>> aa7b40c (Manifest_cache true) =======
    1015. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
    1016. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    1017. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) options.add_argument('--allow-insecure-localhost') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--allow-insecure-localhost') ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) options.add_argument('--allow-insecure-localhost') ======= options.add_argument('--window-size=1400,1400') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--window-size=1400,1400') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1018. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs)
    1019. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    1020. ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    1021. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
    1022. 1 =======
    1023. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    1024. 1 >>>>>>> 752f0c0 (Featire specs) =======
    1025. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1026. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    1027. >>>>>>> aa7b40c (Manifest_cache true) =======
    1028. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    1029. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1030. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
    1031. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    1032. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1033. =======
    1034. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
    1035. 1 =======
    1036. =======
    1037. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    1038. ======= <<<<<<< HEAD
    1039. 1 =======
    1040. >>>>>>> ebcdce06 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    1041. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
    1042. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
    1043. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    1044. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
    1045. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
    1046. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
    1047. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
    1048. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
    1049. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
    1050. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
    1051. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
    1052. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
    1053. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    1054. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
    1055. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    1056. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    1057. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    1058. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    1059. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
    1060. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    1061. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1062. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1063. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1064. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    1065. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    1066. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
    1067. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    1068. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    1069. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= =======
    1070. 1 >>>>>>> 752f0c0 (Featire specs) =======
    1071. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1072. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    1073. >>>>>>> aa7b40c (Manifest_cache true) =======
    1074. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
    1075. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    1076. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= options.add_argument('--allow-insecure-localhost') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1077. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs)
    1078. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    1079. ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    1080. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
    1081. 1 =======
    1082. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    1083. 1 >>>>>>> 752f0c0 (Featire specs) =======
    1084. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1085. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    1086. >>>>>>> aa7b40c (Manifest_cache true) =======
    1087. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    1088. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1089. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
    1090. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    1091. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1092. =======
    1093. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
    1094. 1 =======
    1095. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    1096. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
    1097. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
    1098. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
    1099. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
    1100. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
    1101. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
    1102. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
    1103. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 11792758 (Rebased) ======= =======
    1104. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
    1105. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
    1106. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    1107. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
    1108. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    1109. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    1110. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    1111. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    1112. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1113. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1114. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1115. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    1116. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    1117. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    1118. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
    1119. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    1120. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    1121. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    1122. ======= <<<<<<< HEAD
    1123. 1 =======
    1124. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    1125. 1 >>>>>>> 752f0c0 (Featire specs) =======
    1126. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1127. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    1128. >>>>>>> aa7b40c (Manifest_cache true) =======
    1129. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    1130. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1131. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    1132. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
    1133. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
    1134. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======
    1135. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    1136. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    1137. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
    1138. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
    1139. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
    1140. ======= <<<<<<< HEAD
    1141. 1 =======
    1142. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    1143. 1 >>>>>>> 752f0c0 (Featire specs) =======
    1144. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1145. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    1146. >>>>>>> aa7b40c (Manifest_cache true) =======
    1147. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= =======
    1148. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1149. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
    1150. 1 >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) =======
    1151. 1 >>>>>>> 70fcacc (Featire specs) =======
    1152. >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= =======
    1153. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= =======
    1154. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= =======
    1155. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= =======
    1156. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    1157. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 11792758 (Rebased) =======
    1158. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 31d15e66 (Fix) =======
    1159. 1 >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) =======
    1160. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
    1161. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= =======
    1162. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
    1163. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    1164. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs)
    1165. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
    1166. <<<<<<< HEAD
    1167. =======
    1168. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    1169. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) =======
    1170. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    1171. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1172. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= options.add_argument('--ignore-certificate-errors=true')
    1173. 1 <<<<<<< HEAD ======= =======
    1174. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    1175. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--ignore-certificate-errors=true')
    1176. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) options.add_argument('--accept-insecure-certs=true') >>>>>>> 610b6138 (Featire specs)
    1177. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true)
    1178. =======
    1179. 1 >>>>>>> 08edf50 (Featire specs) =======
    1180. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= =======
    1181. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    1182. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    1183. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    1184. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
    1185. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    1186. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD
    1187. 1 <<<<<<< HEAD ======= ======= <<<<<<< HEAD
    1188. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
    1189. 1 >>>>>>> e3e66f3 (Featire specs) =======
    1190. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    1191. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    1192. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1193. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
    1194. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
    1195. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
    1196. >>>>>>> 49e8a6c (Rebased) =======
    1197. 1 >>>>>>> 872e675 (Fix) =======
    1198. >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
    1199. 1 >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) options.add_argument('--ignore-certificate-errors=true')
    1200. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    1201. 1 <<<<<<< HEAD <<<<<<< HEAD =======
    1202. 1 <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
    1203. =======
    1204. 1 <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
    1205. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1206. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1207. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
    1208. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) =======
    1209. >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    1210. ======= <<<<<<< HEAD
    1211. 1 =======
    1212. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= =======
    1213. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
    1214. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
    1215. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    1216. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    1217. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
    1218. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
    1219. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
    1220. <<<<<<< HEAD
    1221. =======
    1222. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    1223. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
    1224. 1 >>>>>>> 08edf50 (Featire specs) =======
    1225. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1226. 1 >>>>>>> 7a02bbe (Featire specs) =======
    1227. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    1228. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    1229. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
    1230. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) options.add_argument('--accept-insecure-certs=true')
    1231. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1232. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    1233. =======
    1234. >>>>>>> 752f0c0 (Featire specs) =======
    1235. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1236. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ebcdce06 (Featire specs)
    1237. >>>>>>> aa7b40c (Manifest_cache true) =======
    1238. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    1239. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1240. =======
    1241. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
    1242. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
    1243. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= =======
    1244. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
    1245. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
    1246. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    1247. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    1248. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
    1249. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
    1250. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
    1251. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    1252. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= =======
    1253. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    1254. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    1255. =======
    1256. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    1257. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    1258. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    1259. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    1260. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
    1261. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= =======
    1262. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    1263. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
    1264. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    1265. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    1266. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    1267. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1268. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    1269. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs)
    1270. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs)
    1271. >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs)
    1272. 1 =======
    1273. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
    1274. 1 >>>>>>> 752f0c0 (Featire specs) =======
    1275. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) =======
    1276. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) =======
    1277. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
    1278. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    1279. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    1280. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    1281. =======
    1282. >>>>>>> d0dc1f1 (Featire specs) 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs)
    1283. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
    1284. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
    1285. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
    1286. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
    1287. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
    1288. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
    1289. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    1290. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
    1291. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    1292. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1293. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1294. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    1295. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
    1296. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    1297. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    1298. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
    1299. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    1300. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    1301. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) Capybara::Selenium::Driver.new(
    1302. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1303. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true)
    1304. =======
    1305. >>>>>>> 4e81ea2 (Featire specs) =======
    1306. >>>>>>> aa7b40c (Manifest_cache true) =======
    1307. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    1308. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    1309. =======
    1310. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    1311. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
    1312. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= =======
    1313. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
    1314. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= =======
    1315. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
    1316. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    1317. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    1318. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
    1319. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
    1320. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
    1321. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
    1322. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    1323. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= =======
    1324. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    1325. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    1326. =======
    1327. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    1328. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    1329. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    1330. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    1331. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    1332. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
    1333. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= =======
    1334. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    1335. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
    1336. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    1337. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    1338. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs)
    1339. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true)
    1340. =======
    1341. >>>>>>> 4e81ea2 (Featire specs) =======
    1342. >>>>>>> aa7b40c (Manifest_cache true) =======
    1343. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= =======
    1344. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs)
    1345. =======
    1346. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= =======
    1347. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
    1348. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
    1349. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
    1350. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
    1351. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
    1352. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    1353. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= =======
    1354. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    1355. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) app,
    1356. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD
    1357. >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased)
    1358. ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs)
    1359. =======
    1360. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
    1361. >>>>>>> 02a399d (Manifest_cache true) =======
    1362. >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD app, ======= browser: :chrome, >>>>>>> c7a726c5 (Rebased)
    1363. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    1364. ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs)
    1365. =======
    1366. >>>>>>> d0dc1f1 (Featire specs) =======
    1367. >>>>>>> 02a399d (Manifest_cache true) =======
    1368. >>>>>>> 752f0c0 (Featire specs) =======
    1369. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1370. >>>>>>> 4e81ea2 (Featire specs) =======
    1371. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
    1372. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    1373. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1374. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD
    1375. <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
    1376. =======
    1377. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
    1378. >>>>>>> 02a399d (Manifest_cache true) =======
    1379. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
    1380. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1381. >>>>>>> 4e81ea2 (Featire specs) =======
    1382. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= =======
    1383. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    1384. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1385. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true)
    1386. <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= =======
    1387. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
    1388. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= =======
    1389. >>>>>>> 752f0c0 (Featire specs) =======
    1390. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1391. >>>>>>> 4e81ea2 (Featire specs) =======
    1392. >>>>>>> aa7b40c (Manifest_cache true) =======
    1393. >>>>>>> 08edf50 (Featire specs) =======
    1394. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1395. >>>>>>> 7a02bbe (Featire specs) =======
    1396. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
    1397. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
    1398. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix)
    1399. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    1400. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    1401. >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD browser: :chrome, ======= http_client: client, >>>>>>> c7a726c5 (Rebased)
    1402. <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs)
    1403. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs)
    1404. =======
    1405. >>>>>>> d0dc1f1 (Featire specs) =======
    1406. >>>>>>> 02a399d (Manifest_cache true) =======
    1407. >>>>>>> 752f0c0 (Featire specs) =======
    1408. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1409. >>>>>>> 4e81ea2 (Featire specs) =======
    1410. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
    1411. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    1412. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1413. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD
    1414. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs)
    1415. ======= ======= ======= >>>>>>> 08edf50 (Featire specs) =======
    1416. ======= >>>>>>> 93bdda9 (Featire specs)
    1417. >>>>>>> d0dc1f1 (Featire specs) ======= =======
    1418. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
    1419. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
    1420. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
    1421. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs)
    1422. =======
    1423. >>>>>>> d0dc1f1 (Featire specs) =======
    1424. >>>>>>> 02a399d (Manifest_cache true) =======
    1425. >>>>>>> 752f0c0 (Featire specs) =======
    1426. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1427. >>>>>>> 4e81ea2 (Featire specs) =======
    1428. >>>>>>> aa7b40c (Manifest_cache true) =======
    1429. >>>>>>> 08edf50 (Featire specs) =======
    1430. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    1431. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    1432. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
    1433. >>>>>>> 11792758 (Rebased) ======= ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs)
    1434. =======
    1435. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
    1436. >>>>>>> 02a399d (Manifest_cache true) =======
    1437. >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD browser: :chrome,
    1438. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs)
    1439. =======
    1440. >>>>>>> d0dc1f1 (Featire specs) =======
    1441. >>>>>>> 02a399d (Manifest_cache true) =======
    1442. >>>>>>> 752f0c0 (Featire specs) =======
    1443. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1444. >>>>>>> 4e81ea2 (Featire specs) =======
    1445. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
    1446. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
    1447. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1448. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
    1449. >>>>>>> 11792758 (Rebased) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD http_client: client, <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD =======
    1450. >>>>>>> bf554f4 (Rebased)
    1451. <<<<<<< HEAD =======
    1452. >>>>>>> d0dc1f1 (Featire specs) =======
    1453. >>>>>>> 02a399d (Manifest_cache true) =======
    1454. >>>>>>> 752f0c0 (Featire specs) =======
    1455. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1456. >>>>>>> 4e81ea2 (Featire specs) =======
    1457. >>>>>>> aa7b40c (Manifest_cache true) =======
    1458. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
    1459. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1460. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) options: options >>>>>>> 752f0c0 (Featire specs) ======= http_client: client, >>>>>>> 4e81ea2 (Featire specs) ======= browser: :chrome, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    1461. >>>>>>> df37394 (Featire specs)
    1462. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
    1463. >>>>>>> 02a399d (Manifest_cache true) =======
    1464. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
    1465. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1466. >>>>>>> 4e81ea2 (Featire specs) =======
    1467. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= =======
    1468. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
    1469. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    1470. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1471. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs)
    1472. <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= =======
    1473. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= =======
    1474. >>>>>>> 08edf50 (Featire specs) =======
    1475. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    1476. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
    1477. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
    1478. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix)
    1479. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) http_client: client, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= http_client: client, <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= http_client: client, <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> d8abfed3 (Featire specs) <<<<<<< HEAD =======
    1480. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf554f4 (Rebased)
    1481. <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD =======
    1482. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs)
    1483. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD
    1484. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
    1485. <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
    1486. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs)
    1487. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1488. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD
    1489. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1490. >>>>>>> 4e81ea2 (Featire specs) =======
    1491. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    1492. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
    1493. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1494. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 255dd8d (Manifest_cache true) =======
    1495. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= =======
    1496. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    1497. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1498. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= =======
    1499. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= =======
    1500. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= =======
    1501. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= =======
    1502. >>>>>>> 08edf50 (Featire specs) =======
    1503. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    1504. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
    1505. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
    1506. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) options: options >>>>>>> 752f0c0 (Featire specs) ======= http_client: client, >>>>>>> 4e81ea2 (Featire specs) ======= browser: :chrome, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= http_client: client, >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
    1507. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    1508. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    1509. =======
    1510. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    1511. >>>>>>> 02a399d (Manifest_cache true) =======
    1512. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs)
    1513. ======= <<<<<<< HEAD
    1514. =======
    1515. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
    1516. >>>>>>> 02a399d (Manifest_cache true) =======
    1517. >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    1518. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 304cd28a (Manifest_cache true)
    1519. ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true)
    1520. =======
    1521. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    1522. >>>>>>> 02a399d (Manifest_cache true) =======
    1523. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
    1524. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    1525. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) =======
    1526. >>>>>>> 4e81ea2 (Featire specs) =======
    1527. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= =======
    1528. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= =======
    1529. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= =======
    1530. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= =======
    1531. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
    1532. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    1533. =======
    1534. >>>>>>> d0dc1f1 (Featire specs) =======
    1535. >>>>>>> 02a399d (Manifest_cache true) =======
    1536. >>>>>>> 752f0c0 (Featire specs) =======
    1537. >>>>>>> bd8bda4 (Manifest_cache true) =======
    1538. >>>>>>> 4e81ea2 (Featire specs) =======
    1539. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
    1540. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    1541. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1542. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) =======
    1543. >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= =======
    1544. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    1545. >>>>>>> 183b6c5 (Manifest_cache true) =======
    1546. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    1547. >>>>>>> 49e8a6c (Rebased) ======= =======
    1548. >>>>>>> 08edf50 (Featire specs) =======
    1549. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    1550. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    1551. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
    1552. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
    1553. >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
    1554. >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= =======
    1555. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
    1556. >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 4f4ea3f9 (Featire specs) ) ======= ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    1557. <<<<<<< HEAD
    1558. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    1559. =======
    1560. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
    1561. >>>>>>> 02a399d (Manifest_cache true) =======
    1562. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
    1563. <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
    1564. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD
    1565. >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
    1566. >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD
    1567. >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
    1568. >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
    1569. >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83d (Rebased)
    1570. <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
    1571. >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased)
    1572. <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
    1573. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1574. =======
    1575. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    1576. >>>>>>> 02a399d (Manifest_cache true) =======
    1577. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= )
    1578. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    1579. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs)
    1580. =======
    1581. >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true)
    1582. >>>>>>> 02a399d (Manifest_cache true) =======
    1583. >>>>>>> 752f0c0 (Featire specs) =======
    1584. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
    1585. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) ======= =======
    1586. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= =======
    1587. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
    1588. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    1589. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    1590. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
    1591. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD
    1592. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= =======
    1593. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
    1594. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    1595. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= =======
    1596. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    1597. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    1598. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
    1599. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    1600. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    1601. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
    1602. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= =======
    1603. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    1604. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
    1605. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    1606. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
    1607. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= )
    1608. ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= =======
    1609. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) end

    spec/support/configs/shoulda_matcher.rb

    100.0% lines covered

    5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 Shoulda::Matchers.configure do |config|
    2. 1 config.integrate do |with|
    3. 1 with.test_framework :rspec
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    5. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs)
    6. 1 =======
    7. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    8. >>>>>>> 752f0c0 (Featire specs) =======
    9. >>>>>>> 4e81ea2 (Featire specs) =======
    10. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
    11. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
    12. 1 >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    13. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    14. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    15. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    16. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
    17. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    18. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
    19. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
    20. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    21. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) with.library :active_record ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= with.library :active_record ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) with.library :active_record ======= # Keep as many of these lines as are necessary: >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 4e81ea2 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= with.library :active_record >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 0d6dd12 (Manifest_cache true) ======= # Keep as many of these lines as are necessary: >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= with.library :active_record >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= with.library :active_record >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    22. =======
    23. >>>>>>> c7a726c5 (Rebased) 1 ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) with.library :active_record ======= >>>>>>> 610b6138 (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= with.library :active_record >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) with.library :active_record ======= <<<<<<< HEAD with.library :active_record ======= # Keep as many of these lines as are necessary: >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    24. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) with.library :active_record
    25. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) with.library :active_model
    26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    27. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    28. ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
    29. ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs)
    30. =======
    31. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    32. >>>>>>> 752f0c0 (Featire specs) =======
    33. >>>>>>> 4e81ea2 (Featire specs) =======
    34. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    35. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) =======
    36. >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= =======
    37. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    38. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    39. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= =======
    40. >>>>>>> 0d6dd12 (Manifest_cache true) =======
    41. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
    42. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    43. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
    44. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
    45. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= =======
    46. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
    47. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    48. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
    49. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    50. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    51. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
    52. >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    53. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    54. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    55. ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
    56. ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs)
    57. =======
    58. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    59. >>>>>>> 752f0c0 (Featire specs) =======
    60. >>>>>>> 4e81ea2 (Featire specs) =======
    61. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
    62. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) =======
    63. >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= =======
    64. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    65. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
    66. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= =======
    67. >>>>>>> 0d6dd12 (Manifest_cache true) =======
    68. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
    69. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
    70. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
    71. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
    72. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= =======
    73. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
    74. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    75. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
    76. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    77. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
    78. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
    79. >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 379e583 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 58c2c0f1 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1622d61 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9afd7e66 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> a45f1ec (Add login registration pages) <<<<<<< HEAD >>>>>>> 3b954593 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> add330c (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 5a7e688 (Add User and Review Decorators and Show Review) <<<<<<< HEAD >>>>>>> 4bf50361 (Add User and Review Decorators and Show Review) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)